diff options
41 files changed, 1034 insertions, 998 deletions
@@ -47,7 +47,7 @@ $(red_obj): %_red.o: %.asm $$(%_dep) $(blue_obj): %_blue.o: %.asm $$(%_dep) rgbasm -D "_BLUE" -h -o $@ $*.asm -dmg_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 +dmg_opt = -jsv -k 01 -l 0x33 -m 0x1B -p 0 -r 03 red_opt = $(dmg_opt) -t "POKEMON RED" blue_opt = $(dmg_opt) -t "POKEMON BLUE" @@ -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 e70a305f..a5d41692 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -1016,9 +1016,9 @@ Audio2_21e8b: ; 21e8b (8:5e8b) 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 980c79a3..6ce6e485 100644 --- a/charmap.asm +++ b/charmap.asm @@ -220,15 +220,11 @@ 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 6f06d699..ab9c6ec4 100755 --- a/data/pokedex_entries.asm +++ b/data/pokedex_entries.asm @@ -191,1064 +191,1064 @@ PokedexEntryPointers: ; 4047e (10:447e) dw VictreebelDexEntry ; string: species name -; height in feet, inches -; weight in pounds +; height in decimetres +; weight in centigrams ; text entry -RhydonDexEntry: ; 405fa (10:45fa) - db "DRILL@" - db 6,3 - dw 2650 +RhydonDexEntry: ; 405f8 (10:45f8) + db "PERCEUR@" + db 19 + dw 1200 TX_FAR _RhydonDexEntry db "@" KangaskhanDexEntry: ; 40609 (10:4609) - db "PARENT@" - db 7,3 - dw 1760 + db "MATERNEL@" + db 22 + dw 800 TX_FAR _KangaskhanDexEntry db "@" NidoranMDexEntry: ; 40619 (10:4619) - db "POISON PIN@" - db 1,8 - dw 200 + db "VENEPIC@" + db 5 + dw 90 TX_FAR _NidoranMDexEntry db "@" ClefairyDexEntry: ; 4062d (10:462d) - db "FAIRY@" - db 2,0 - dw 170 + db "FEE@" + db 6 + dw 75 TX_FAR _ClefairyDexEntry db "@" SpearowDexEntry: ; 4063c (10:463c) - db "TINY BIRD@" - db 1,0 - dw 40 + db "MINOISEAU@" + db 3 + dw 20 TX_FAR _SpearowDexEntry db "@" VoltorbDexEntry: ; 4064f (10:464f) - db "BALL@" - db 1,8 - dw 230 + db "BALLE@" + db 5 + dw 104 TX_FAR _VoltorbDexEntry db "@" NidokingDexEntry: ; 4065d (10:465d) - db "DRILL@" - db 4,7 - dw 1370 + db "PERCEUR@" + db 14 + dw 620 TX_FAR _NidokingDexEntry db "@" SlowbroDexEntry: ; 4066c (10:466c) - db "HERMITCRAB@" - db 5,3 - dw 1730 + db "SYMBIOSE@" + db 16 + dw 785 TX_FAR _SlowbroDexEntry db "@" IvysaurDexEntry: ; 40680 (10:4680) - db "SEED@" - db 3,3 - dw 290 + db "GRAINE@" + db 10 + dw 130 TX_FAR _IvysaurDexEntry db "@" ExeggutorDexEntry: ; 4068e (10:468e) - db "COCONUT@" - db 6,7 - dw 2650 + db "FRUITPALME@" + db 20 + dw 1200 TX_FAR _ExeggutorDexEntry db "@" LickitungDexEntry: ; 4069f (10:469f) - db "LICKING@" - db 3,11 - dw 1440 + db "LECHEUR@" + db 12 + dw 655 TX_FAR _LickitungDexEntry db "@" ExeggcuteDexEntry: ; 406b0 (10:46b0) - db "EGG@" - db 1,4 - dw 60 + db "OEUF@" + db 4 + dw 25 TX_FAR _ExeggcuteDexEntry db "@" GrimerDexEntry: ; 406bd (10:46bd) - db "SLUDGE@" - db 2,11 - dw 660 + db "DEGUEU@" + db 9 + dw 300 TX_FAR _GrimerDexEntry db "@" GengarDexEntry: ; 406cd (10:46cd) - db "SHADOW@" - db 4,11 - dw 890 + db "OMBRE@" + db 15 + dw 405 TX_FAR _GengarDexEntry db "@" NidoranFDexEntry: ; 406dd (10:46dd) - db "POISON PIN@" - db 1,4 - dw 150 + db "VENEPIC@" + db 4 + dw 70 TX_FAR _NidoranFDexEntry db "@" NidoqueenDexEntry: ; 406f1 (10:46f1) - db "DRILL@" - db 4,3 - dw 1320 + db "PERCEUR@" + db 13 + dw 600 TX_FAR _NidoqueenDexEntry db "@" CuboneDexEntry: ; 40700 (10:4700) - db "LONELY@" - db 1,4 - dw 140 + db "SOLITAIRE@" + db 4 + dw 65 TX_FAR _CuboneDexEntry db "@" RhyhornDexEntry: ; 40710 (10:4710) - db "SPIKES@" - db 3,3 - dw 2540 + db "PIQUANT@" + db 10 + dw 1150 TX_FAR _RhyhornDexEntry db "@" LaprasDexEntry: ; 40720 (10:4720) db "TRANSPORT@" - db 8,2 - dw 4850 + db 25 + dw 2200 TX_FAR _LaprasDexEntry db "@" ArcanineDexEntry: ; 40733 (10:4733) - db "LEGENDARY@" - db 6,3 - dw 3420 + db "LEGENDAIRE@" + db 19 + dw 1550 TX_FAR _ArcanineDexEntry db "@" MewDexEntry: ; 40746 (10:4746) - db "NEW SPECIE@" - db 1,4 - dw 90 + db "NOUVEAU@" + db 4 + dw 40 TX_FAR _MewDexEntry db "@" GyaradosDexEntry: ; 4075a (10:475a) - db "ATROCIOUS@" - db 21,4 - dw 5180 + db "TERRIFIANT@" + db 65 + dw 2350 TX_FAR _GyaradosDexEntry db "@" ShellderDexEntry: ; 4076d (10:476d) db "BIVALVE@" - db 1,0 - dw 90 + db 3 + dw 40 TX_FAR _ShellderDexEntry db "@" TentacoolDexEntry: ; 4077e (10:477e) - db "JELLYFISH@" - db 2,11 - dw 1000 + db "MOLLUSQUE@" + db 9 + dw 455 TX_FAR _TentacoolDexEntry db "@" GastlyDexEntry: ; 40791 (10:4791) - db "GAS@" - db 4,3 - dw 2 + db "GAZ@" + db 13 + dw 1 TX_FAR _GastlyDexEntry db "@" ScytherDexEntry: ; 4079e (10:479e) - db "MANTIS@" - db 4,11 - dw 1230 + db "MANTE@" + db 15 + dw 560 TX_FAR _ScytherDexEntry db "@" StaryuDexEntry: ; 407ae (10:47ae) - db "STARSHAPE@" - db 2,7 - dw 760 + db "ETOILE@" + db 8 + dw 345 TX_FAR _StaryuDexEntry db "@" BlastoiseDexEntry: ; 407c1 (10:47c1) - db "SHELLFISH@" - db 5,3 - dw 1890 + db "CARAPACE@" + db 16 + dw 855 TX_FAR _BlastoiseDexEntry db "@" PinsirDexEntry: ; 407d4 (10:47d4) - db "STAGBEETLE@" - db 4,11 - dw 1210 + db "SCARABEE@" + db 15 + dw 550 TX_FAR _PinsirDexEntry db "@" TangelaDexEntry: ; 407e8 (10:47e8) - db "VINE@" - db 3,3 - dw 770 + db "VIGNE@" + db 10 + dw 350 TX_FAR _TangelaDexEntry db "@" GrowlitheDexEntry: ; 407f6 (10:47f6) - db "PUPPY@" - db 2,4 - dw 420 + db "CHIOT@" + db 7 + dw 190 TX_FAR _GrowlitheDexEntry db "@" OnixDexEntry: ; 40805 (10:4805) - db "ROCK SNAKE@" - db 28,10 - dw 4630 + db "SERPENROC@" + db 88 + dw 2100 TX_FAR _OnixDexEntry db "@" FearowDexEntry: ; 40819 (10:4819) - db "BEAK@" - db 3,11 - dw 840 + db "BEC-OISEAU@" + db 12 + dw 380 TX_FAR _FearowDexEntry db "@" PidgeyDexEntry: ; 40827 (10:4827) - db "TINY BIRD@" - db 1,0 - dw 40 + db "MINOISEAU@" + db 3 + dw 18 TX_FAR _PidgeyDexEntry db "@" SlowpokeDexEntry: ; 4083a (10:483a) - db "DOPEY@" - db 3,11 - dw 790 + db "CRETIN@" + db 12 + dw 360 TX_FAR _SlowpokeDexEntry db "@" KadabraDexEntry: ; 40849 (10:4849) - db "PSI@" - db 4,3 - dw 1250 + db "PSY@" + db 13 + dw 565 TX_FAR _KadabraDexEntry db "@" GravelerDexEntry: ; 40856 (10:4856) - db "ROCK@" - db 3,3 - dw 2320 + db "ROCHE@" + db 10 + dw 1050 TX_FAR _GravelerDexEntry db "@" ChanseyDexEntry: ; 40864 (10:4864) - db "EGG@" - db 3,7 - dw 760 + db "OEUF@" + db 11 + dw 346 TX_FAR _ChanseyDexEntry db "@" MachokeDexEntry: ; 40871 (10:4871) - db "SUPERPOWER@" - db 4,11 - dw 1550 + db "COLOSSE@" + db 15 + dw 705 TX_FAR _MachokeDexEntry db "@" MrMimeDexEntry: ; 40885 (10:4885) - db "BARRIER@" - db 4,3 - dw 1200 + db "BLOQUEUR@" + db 13 + dw 545 TX_FAR _MrMimeDexEntry db "@" HitmonleeDexEntry: ; 40896 (10:4896) - db "KICKING@" - db 4,11 - dw 1100 + db "LATTEUR@" + db 15 + dw 498 TX_FAR _HitmonleeDexEntry db "@" HitmonchanDexEntry: ; 408a7 (10:48a7) - db "PUNCHING@" - db 4,7 - dw 1110 + db "PUNCHEUR@" + db 14 + dw 502 TX_FAR _HitmonchanDexEntry db "@" ArbokDexEntry: ; 408b9 (10:48b9) db "COBRA@" - db 11,6 - dw 1430 + db 35 + dw 650 TX_FAR _ArbokDexEntry db "@" ParasectDexEntry: ; 408c8 (10:48c8) - db "MUSHROOM@" - db 3,3 - dw 650 + db "CHAMPIGNON@" + db 10 + dw 295 TX_FAR _ParasectDexEntry db "@" PsyduckDexEntry: ; 408da (10:48da) - db "DUCK@" - db 2,7 - dw 430 + db "CANARD@" + db 8 + dw 196 TX_FAR _PsyduckDexEntry db "@" DrowzeeDexEntry: ; 408e8 (10:48e8) - db "HYPNOSIS@" - db 3,3 - dw 710 + db "HYPNOSE@" + db 10 + dw 324 TX_FAR _DrowzeeDexEntry db "@" GolemDexEntry: ; 408fa (10:48fa) - db "MEGATON@" - db 4,7 - dw 6620 + db "TITANESQUE@" + db 14 + dw 3000 TX_FAR _GolemDexEntry db "@" MagmarDexEntry: ; 4090b (10:490b) - db "SPITFIRE@" - db 4,3 - dw 980 + db "CRACHE-FEU@" + db 13 + dw 445 TX_FAR _MagmarDexEntry db "@" ElectabuzzDexEntry: ; 4091d (10:491d) - db "ELECTRIC@" - db 3,7 - dw 660 + db "ELECTRIQUE@" + db 11 + dw 300 TX_FAR _ElectabuzzDexEntry db "@" MagnetonDexEntry: ; 4092f (10:492f) - db "MAGNET@" - db 3,3 - dw 1320 + db "MAGNETIQUE@" + db 10 + dw 600 TX_FAR _MagnetonDexEntry db "@" KoffingDexEntry: ; 4093f (10:493f) - db "POISON GAS@" - db 2,0 - dw 20 + db "GAZ MORTEL@" + db 6 + dw 10 TX_FAR _KoffingDexEntry db "@" MankeyDexEntry: ; 40953 (10:4953) - db "PIG MONKEY@" - db 1,8 - dw 620 + db "PORSINGE@" + db 5 + dw 280 TX_FAR _MankeyDexEntry db "@" SeelDexEntry: ; 40967 (10:4967) - db "SEA LION@" - db 3,7 - dw 1980 + db "OTARIE@" + db 11 + dw 900 TX_FAR _SeelDexEntry db "@" DiglettDexEntry: ; 40979 (10:4979) - db "MOLE@" - db 0,8 - dw 20 + db "TAUPE@" + db 2 + dw 8 TX_FAR _DiglettDexEntry db "@" TaurosDexEntry: ; 40987 (10:4987) - db "WILD BULL@" - db 4,7 - dw 1950 + db "BUFFLE@" + db 14 + dw 884 TX_FAR _TaurosDexEntry db "@" FarfetchdDexEntry: ; 4099a (10:499a) - db "WILD DUCK@" - db 2,7 - dw 330 + db "CANARD FOU@" + db 8 + dw 150 TX_FAR _FarfetchdDexEntry db "@" VenonatDexEntry: ; 409ad (10:49ad) - db "INSECT@" - db 3,3 - dw 660 + db "VERMINE@" + db 10 + dw 300 TX_FAR _VenonatDexEntry db "@" DragoniteDexEntry: ; 409bd (10:49bd) db "DRAGON@" - db 7,3 - dw 4630 + db 22 + dw 2100 TX_FAR _DragoniteDexEntry db "@" DoduoDexEntry: ; 409cd (10:49cd) - db "TWIN BIRD@" - db 4,7 - dw 860 + db "DUOISEAU@" + db 14 + dw 392 TX_FAR _DoduoDexEntry db "@" PoliwagDexEntry: ; 409e0 (10:49e0) - db "TADPOLE@" - db 2,0 - dw 270 + db "TETARD@" + db 6 + dw 124 TX_FAR _PoliwagDexEntry db "@" JynxDexEntry: ; 409f1 (10:49f1) - db "HUMANSHAPE@" - db 4,7 - dw 900 + db "HUMANOIDE@" + db 14 + dw 406 TX_FAR _JynxDexEntry db "@" MoltresDexEntry: ; 40a05 (10:4a05) - db "FLAME@" - db 6,7 - dw 1320 + db "FLAMME@" + db 20 + dw 600 TX_FAR _MoltresDexEntry db "@" ArticunoDexEntry: ; 40a14 (10:4a14) - db "FREEZE@" - db 5,7 - dw 1220 + db "GLACIAIRE@" + db 17 + dw 554 TX_FAR _ArticunoDexEntry db "@" ZapdosDexEntry: ; 40a24 (10:4a24) - db "ELECTRIC@" - db 5,3 - dw 1160 + db "ELECTRIQUE@" + db 16 + dw 526 TX_FAR _ZapdosDexEntry db "@" DittoDexEntry: ; 40a36 (10:4a36) - db "TRANSFORM@" - db 1,0 - dw 90 + db "MORPHING@" + db 3 + dw 40 TX_FAR _DittoDexEntry db "@" MeowthDexEntry: ; 40a49 (10:4a49) - db "SCRATCHCAT@" - db 1,4 - dw 90 + db "CHADEGOUT@" + db 4 + dw 42 TX_FAR _MeowthDexEntry db "@" KrabbyDexEntry: ; 40a5d (10:4a5d) - db "RIVER CRAB@" - db 1,4 - dw 140 + db "DOUX CRABE@" + db 4 + dw 65 TX_FAR _KrabbyDexEntry db "@" VulpixDexEntry: ; 40a71 (10:4a71) - db "FOX@" - db 2,0 - dw 220 + db "RENARD@" + db 6 + dw 99 TX_FAR _VulpixDexEntry db "@" NinetalesDexEntry: ; 40a7e (10:4a7e) - db "FOX@" - db 3,7 - dw 440 + db "RENARD@" + db 11 + dw 199 TX_FAR _NinetalesDexEntry db "@" PikachuDexEntry: ; 40a8b (10:4a8b) - db "MOUSE@" - db 1,4 - dw 130 + db "SOURIS@" + db 4 + dw 60 TX_FAR _PikachuDexEntry db "@" RaichuDexEntry: ; 40a9a (10:4a9a) - db "MOUSE@" - db 2,7 - dw 660 + db "SOURIS@" + db 8 + dw 300 TX_FAR _RaichuDexEntry db "@" DratiniDexEntry: ; 40aa9 (10:4aa9) db "DRAGON@" - db 5,11 - dw 70 + db 18 + dw 33 TX_FAR _DratiniDexEntry db "@" DragonairDexEntry: ; 40ab9 (10:4ab9) db "DRAGON@" - db 13,1 - dw 360 + db 40 + dw 165 TX_FAR _DragonairDexEntry db "@" KabutoDexEntry: ; 40ac9 (10:4ac9) - db "SHELLFISH@" - db 1,8 - dw 250 + db "CARAPACE@" + db 5 + dw 115 TX_FAR _KabutoDexEntry db "@" KabutopsDexEntry: ; 40adc (10:4adc) - db "SHELLFISH@" - db 4,3 - dw 890 + db "CARAPACE@" + db 13 + dw 405 TX_FAR _KabutopsDexEntry db "@" HorseaDexEntry: ; 40aef (10:4aef) db "DRAGON@" - db 1,4 - dw 180 + db 4 + dw 80 TX_FAR _HorseaDexEntry db "@" SeadraDexEntry: ; 40aff (10:4aff) db "DRAGON@" - db 3,11 - dw 550 + db 12 + dw 250 TX_FAR _SeadraDexEntry db "@" SandshrewDexEntry: ; 40b0f (10:4b0f) - db "MOUSE@" - db 2,0 - dw 260 + db "SOURIS@" + db 6 + dw 120 TX_FAR _SandshrewDexEntry db "@" SandslashDexEntry: ; 40b1e (10:4b1e) - db "MOUSE@" - db 3,3 - dw 650 + db "SOURIS@" + db 10 + dw 295 TX_FAR _SandslashDexEntry db "@" OmanyteDexEntry: ; 40b2d (10:4b2d) - db "SPIRAL@" - db 1,4 - dw 170 + db "SPIRALE@" + db 4 + dw 75 TX_FAR _OmanyteDexEntry db "@" OmastarDexEntry: ; 40b3d (10:4b3d) - db "SPIRAL@" - db 3,3 - dw 770 + db "SPIRALE@" + db 10 + dw 350 TX_FAR _OmastarDexEntry db "@" JigglypuffDexEntry: ; 40b4d (10:4b4d) - db "BALLOON@" - db 1,8 - dw 120 + db "BOUBOULE@" + db 5 + dw 55 TX_FAR _JigglypuffDexEntry db "@" WigglytuffDexEntry: ; 40b5e (10:4b5e) - db "BALLOON@" - db 3,3 - dw 260 + db "BOUBOULE@" + db 10 + dw 120 TX_FAR _WigglytuffDexEntry db "@" EeveeDexEntry: ; 40b6f (10:4b6f) - db "EVOLUTION@" - db 1,0 - dw 140 + db "EVOLUTIF@" + db 3 + dw 65 TX_FAR _EeveeDexEntry db "@" FlareonDexEntry: ; 40b82 (10:4b82) - db "FLAME@" - db 2,11 - dw 550 + db "FLAMME@" + db 9 + dw 250 TX_FAR _FlareonDexEntry db "@" JolteonDexEntry: ; 40b91 (10:4b91) - db "LIGHTNING@" - db 2,7 - dw 540 + db "FOUDRE@" + db 8 + dw 245 TX_FAR _JolteonDexEntry db "@" VaporeonDexEntry: ; 40ba4 (10:4ba4) - db "BUBBLE JET@" - db 3,3 - dw 640 + db "BULLEUR@" + db 10 + dw 290 TX_FAR _VaporeonDexEntry db "@" MachopDexEntry: ; 40bb8 (10:4bb8) - db "SUPERPOWER@" - db 2,7 - dw 430 + db "COLOSSE@" + db 8 + dw 195 TX_FAR _MachopDexEntry db "@" ZubatDexEntry: ; 40bcc (10:4bcc) - db "BAT@" - db 2,7 - dw 170 + db "CHOVSOURIS@" + db 8 + dw 75 TX_FAR _ZubatDexEntry db "@" EkansDexEntry: ; 40bd9 (10:4bd9) - db "SNAKE@" - db 6,7 - dw 150 + db "SERPENT@" + db 20 + dw 69 TX_FAR _EkansDexEntry db "@" ParasDexEntry: ; 40be8 (10:4be8) - db "MUSHROOM@" - db 1,0 - dw 120 + db "CHAMPIGNON@" + db 3 + dw 54 TX_FAR _ParasDexEntry db "@" PoliwhirlDexEntry: ; 40bfa (10:4bfa) - db "TADPOLE@" - db 3,3 - dw 440 + db "TETARD@" + db 10 + dw 200 TX_FAR _PoliwhirlDexEntry db "@" PoliwrathDexEntry: ; 40c0b (10:4c0b) - db "TADPOLE@" - db 4,3 - dw 1190 + db "TETARD@" + db 13 + dw 540 TX_FAR _PoliwrathDexEntry db "@" WeedleDexEntry: ; 40c1c (10:4c1c) - db "HAIRY BUG@" - db 1,0 - dw 70 + db "INSECTOPIC@" + db 3 + dw 32 TX_FAR _WeedleDexEntry db "@" KakunaDexEntry: ; 40c2f (10:4c2f) - db "COCOON@" - db 2,0 - dw 220 + db "COCON@" + db 6 + dw 100 TX_FAR _KakunaDexEntry db "@" BeedrillDexEntry: ; 40c3f (10:4c3f) - db "POISON BEE@" - db 3,3 - dw 650 + db "GUEPOISON@" + db 10 + dw 295 TX_FAR _BeedrillDexEntry db "@" DodrioDexEntry: ; 40c53 (10:4c53) - db "TRIPLEBIRD@" - db 5,11 - dw 1880 + db "TROISEAU@" + db 18 + dw 852 TX_FAR _DodrioDexEntry db "@" PrimeapeDexEntry: ; 40c67 (10:4c67) - db "PIG MONKEY@" - db 3,3 - dw 710 + db "PORSINGE@" + db 10 + dw 320 TX_FAR _PrimeapeDexEntry db "@" DugtrioDexEntry: ; 40c7b (10:4c7b) - db "MOLE@" - db 2,4 - dw 730 + db "TAUPE@" + db 7 + dw 333 TX_FAR _DugtrioDexEntry db "@" VenomothDexEntry: ; 40c89 (10:4c89) - db "POISONMOTH@" - db 4,11 - dw 280 + db "MITE@" + db 15 + dw 125 TX_FAR _VenomothDexEntry db "@" DewgongDexEntry: ; 40c9d (10:4c9d) - db "SEA LION@" - db 5,7 - dw 2650 + db "OTARIE@" + db 17 + dw 1200 TX_FAR _DewgongDexEntry db "@" CaterpieDexEntry: ; 40caf (10:4caf) - db "WORM@" - db 1,0 - dw 60 + db "VER@" + db 3 + dw 29 TX_FAR _CaterpieDexEntry db "@" MetapodDexEntry: ; 40cbd (10:4cbd) - db "COCOON@" - db 2,4 - dw 220 + db "COCON@" + db 7 + dw 99 TX_FAR _MetapodDexEntry db "@" ButterfreeDexEntry: ; 40ccd (10:4ccd) - db "BUTTERFLY@" - db 3,7 - dw 710 + db "PAPILLON@" + db 11 + dw 320 TX_FAR _ButterfreeDexEntry db "@" MachampDexEntry: ; 40ce0 (10:4ce0) - db "SUPERPOWER@" - db 5,3 - dw 2870 + db "COLOSSE@" + db 16 + dw 1300 TX_FAR _MachampDexEntry db "@" GolduckDexEntry: ; 40cf4 (10:4cf4) - db "DUCK@" - db 5,7 - dw 1690 + db "CANARD@" + db 17 + dw 766 TX_FAR _GolduckDexEntry db "@" HypnoDexEntry: ; 40d02 (10:4d02) - db "HYPNOSIS@" - db 5,3 - dw 1670 + db "HYPNOSE@" + db 16 + dw 756 TX_FAR _HypnoDexEntry db "@" GolbatDexEntry: ; 40d14 (10:4d14) - db "BAT@" - db 5,3 - dw 1210 + db "CHOVSOURIS@" + db 16 + dw 550 TX_FAR _GolbatDexEntry db "@" MewtwoDexEntry: ; 40d21 (10:4d21) - db "GENETIC@" - db 6,7 - dw 2690 + db "GENETIQUE@" + db 20 + dw 1220 TX_FAR _MewtwoDexEntry db "@" SnorlaxDexEntry: ; 40d32 (10:4d32) - db "SLEEPING@" - db 6,11 - dw 10140 + db "PIONCEUR@" + db 21 + dw 4600 TX_FAR _SnorlaxDexEntry db "@" MagikarpDexEntry: ; 40d44 (10:4d44) - db "FISH@" - db 2,11 - dw 220 + db "POISSON@" + db 9 + dw 100 TX_FAR _MagikarpDexEntry db "@" MukDexEntry: ; 40d52 (10:4d52) - db "SLUDGE@" - db 3,11 - dw 660 + db "DEGUEU@" + db 12 + dw 300 TX_FAR _MukDexEntry db "@" KinglerDexEntry: ; 40d62 (10:4d62) - db "PINCER@" - db 4,3 - dw 1320 + db "POIGNEUR@" + db 13 + dw 600 TX_FAR _KinglerDexEntry db "@" CloysterDexEntry: ; 40d72 (10:4d72) db "BIVALVE@" - db 4,11 - dw 2920 + db 15 + dw 1325 TX_FAR _CloysterDexEntry db "@" ElectrodeDexEntry: ; 40d83 (10:4d83) - db "BALL@" - db 3,11 - dw 1470 + db "BALLE@" + db 12 + dw 666 TX_FAR _ElectrodeDexEntry db "@" ClefableDexEntry: ; 40d91 (10:4d91) - db "FAIRY@" - db 4,3 - dw 880 + db "FEE@" + db 13 + dw 400 TX_FAR _ClefableDexEntry db "@" WeezingDexEntry: ; 40da0 (10:4da0) - db "POISON GAS@" - db 3,11 - dw 210 + db "GAZ MORTEL@" + db 12 + dw 95 TX_FAR _WeezingDexEntry db "@" PersianDexEntry: ; 40db4 (10:4db4) - db "CLASSY CAT@" - db 3,3 - dw 710 + db "CHADEVILLE@" + db 10 + dw 320 TX_FAR _PersianDexEntry db "@" MarowakDexEntry: ; 40dc8 (10:4dc8) - db "BONEKEEPER@" - db 3,3 - dw 990 + db "GARD'OS@" + db 10 + dw 450 TX_FAR _MarowakDexEntry db "@" HaunterDexEntry: ; 40ddc (10:4ddc) - db "GAS@" - db 5,3 - dw 2 + db "GAZ@" + db 16 + dw 1 TX_FAR _HaunterDexEntry db "@" AbraDexEntry: ; 40de9 (10:4de9) - db "PSI@" - db 2,11 - dw 430 + db "PSY@" + db 9 + dw 195 TX_FAR _AbraDexEntry db "@" AlakazamDexEntry: ; 40df6 (10:4df6) - db "PSI@" - db 4,11 - dw 1060 + db "PSY@" + db 15 + dw 480 TX_FAR _AlakazamDexEntry db "@" PidgeottoDexEntry: ; 40e03 (10:4e03) - db "BIRD@" - db 3,7 - dw 660 + db "OISEAU@" + db 11 + dw 300 TX_FAR _PidgeottoDexEntry db "@" PidgeotDexEntry: ; 40e11 (10:4e11) - db "BIRD@" - db 4,11 - dw 870 + db "OISEAU@" + db 15 + dw 395 TX_FAR _PidgeotDexEntry db "@" StarmieDexEntry: ; 40e1f (10:4e1f) - db "MYSTERIOUS@" - db 3,7 - dw 1760 + db "MYSTERIEUX@" + db 11 + dw 800 TX_FAR _StarmieDexEntry db "@" BulbasaurDexEntry: ; 40e33 (10:4e33) - db "SEED@" - db 2,4 - dw 150 + db "GRAINE@" + db 7 + dw 69 TX_FAR _BulbasaurDexEntry db "@" VenusaurDexEntry: ; 40e41 (10:4e41) - db "SEED@" - db 6,7 - dw 2210 + db "GRAINE@" + db 20 + dw 1000 TX_FAR _VenusaurDexEntry db "@" TentacruelDexEntry: ; 40e4f (10:4e4f) - db "JELLYFISH@" - db 5,3 - dw 1210 + db "MOLLUSQUE@" + db 16 + dw 550 TX_FAR _TentacruelDexEntry db "@" GoldeenDexEntry: ; 40e62 (10:4e62) - db "GOLDFISH@" - db 2,0 - dw 330 + db "POISSON@" + db 6 + dw 150 TX_FAR _GoldeenDexEntry db "@" SeakingDexEntry: ; 40e74 (10:4e74) - db "GOLDFISH@" - db 4,3 - dw 860 + db "POISSON@" + db 13 + dw 390 TX_FAR _SeakingDexEntry db "@" PonytaDexEntry: ; 40e86 (10:4e86) - db "FIRE HORSE@" - db 3,3 - dw 660 + db "CHEVAL FEU@" + db 10 + dw 300 TX_FAR _PonytaDexEntry db "@" RapidashDexEntry: ; 40e9a (10:4e9a) - db "FIRE HORSE@" - db 5,7 - dw 2090 + db "CHEVAL FEU@" + db 17 + dw 950 TX_FAR _RapidashDexEntry db "@" RattataDexEntry: ; 40eae (10:4eae) db "RAT@" - db 1,0 - dw 80 + db 3 + dw 35 TX_FAR _RattataDexEntry db "@" RaticateDexEntry: ; 40ebb (10:4ebb) db "RAT@" - db 2,4 - dw 410 + db 7 + dw 185 TX_FAR _RaticateDexEntry db "@" NidorinoDexEntry: ; 40ec8 (10:4ec8) - db "POISON PIN@" - db 2,11 - dw 430 + db "VENEPIC@" + db 9 + dw 195 TX_FAR _NidorinoDexEntry db "@" NidorinaDexEntry: ; 40edc (10:4edc) - db "POISON PIN@" - db 2,7 - dw 440 + db "VENEPIC@" + db 8 + dw 200 TX_FAR _NidorinaDexEntry db "@" GeodudeDexEntry: ; 40ef0 (10:4ef0) - db "ROCK@" - db 1,4 - dw 440 + db "ROCHE@" + db 4 + dw 200 TX_FAR _GeodudeDexEntry db "@" PorygonDexEntry: ; 40efe (10:4efe) - db "VIRTUAL@" - db 2,7 - dw 800 + db "VIRTUEL@" + db 8 + dw 365 TX_FAR _PorygonDexEntry db "@" AerodactylDexEntry: ; 40f0f (10:4f0f) - db "FOSSIL@" - db 5,11 - dw 1300 + db "FOSSILE@" + db 18 + dw 590 TX_FAR _AerodactylDexEntry db "@" MagnemiteDexEntry: ; 40f1f (10:4f1f) - db "MAGNET@" - db 1,0 - dw 130 + db "MAGNETIQUE@" + db 3 + dw 60 TX_FAR _MagnemiteDexEntry db "@" CharmanderDexEntry: ; 40f2f (10:4f2f) - db "LIZARD@" - db 2,0 - dw 190 + db "LEZARD@" + db 6 + dw 85 TX_FAR _CharmanderDexEntry db "@" SquirtleDexEntry: ; 40f3f (10:4f3f) - db "TINYTURTLE@" - db 1,8 - dw 200 + db "MINITORTUE@" + db 5 + dw 90 TX_FAR _SquirtleDexEntry db "@" CharmeleonDexEntry: ; 40f53 (10:4f53) - db "FLAME@" - db 3,7 - dw 420 + db "FLAMME@" + db 11 + dw 190 TX_FAR _CharmeleonDexEntry db "@" WartortleDexEntry: ; 40f62 (10:4f62) - db "TURTLE@" - db 3,3 - dw 500 + db "TORTUE@" + db 10 + dw 225 TX_FAR _WartortleDexEntry db "@" CharizardDexEntry: ; 40f72 (10:4f72) - db "FLAME@" - db 5,7 - dw 2000 + db "FLAMME@" + db 17 + dw 905 TX_FAR _CharizardDexEntry db "@" OddishDexEntry: ; 40f81 (10:4f81) - db "WEED@" - db 1,8 - dw 120 + db "RACINE@" + db 5 + dw 54 TX_FAR _OddishDexEntry db "@" GloomDexEntry: ; 40f8f (10:4f8f) - db "WEED@" - db 2,7 - dw 190 + db "RACINE@" + db 8 + dw 86 TX_FAR _GloomDexEntry db "@" VileplumeDexEntry: ; 40f9d (10:4f9d) - db "FLOWER@" - db 3,11 - dw 410 + db "FLEUR@" + db 12 + dw 186 TX_FAR _VileplumeDexEntry db "@" BellsproutDexEntry: ; 40fad (10:4fad) - db "FLOWER@" - db 2,4 - dw 90 + db "FLEUR@" + db 7 + dw 40 TX_FAR _BellsproutDexEntry db "@" WeepinbellDexEntry: ; 40fbd (10:4fbd) - db "FLYCATCHER@" - db 3,3 - dw 140 + db "CARNIVORE@" + db 10 + dw 64 TX_FAR _WeepinbellDexEntry db "@" VictreebelDexEntry: ; 40fd1 (10:4fd1) - 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 fce78717..9f553075 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2131,7 +2131,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) ld a, $2 ; select the "ITEM" menu jp .upperLeftMenuItemWasNotSelected .oldManName - db "OLD MAN@" + db "VIEILLARD@" .handleBattleMenuInput ld a, [wBattleAndStartSavedMenuItem] ld [wCurrentMenuItem], a @@ -2762,7 +2762,8 @@ MoveDisabledText: ; 3d3b3 (f:53b3) db "@" WhichTechniqueString: ; 3d3b8 (f:53b8) - db "WHICH TECHNIQUE?@" + db "Quelle technique?" + next " @" CursorUp: ; 3d3c9 (f:53c9) ld a, [wCurrentMenuItem] @@ -2982,7 +2983,7 @@ PrintMenuItem: ; 3d4b6 (f:54b6) jp Delay3 DisabledText: ; 3d555 (f:5555) - db "disabled!@" + db "NON DISP.@" TypeText: ; 3d55f (f:555f) db "TYPE@" @@ -6904,16 +6905,20 @@ InitWildBattle: ; 3ef8b (f:6f8b) ld [hli], a ; write front sprite pointer ld [hl], b ld hl, wEnemyMonNick ; set name to "GHOST" - ld a, "G" + ld a, "S" ld [hli], a - ld a, "H" + ld a, "P" ld [hli], a - ld a, "O" + ld a, "E" ld [hli], a - ld a, "S" + ld a, "C" ld [hli], a ld a, "T" ld [hli], a + ld a, "R" + ld [hli], a + ld a, "E" + ld [hli], a ld [hl], "@" ld a, [wcf91] push af @@ -7955,12 +7960,12 @@ PrintStatText: ; 3f688 (f:7688) jp CopyData StatsTextStrings: ; 3f69f (f:769f) - db "ATTACK@" - db "DEFENSE@" - db "SPEED@" - db "SPECIAL@" - db "ACCURACY@" - db "EVADE@" + db "FOR@" + db "DEF@" + db "VIT@" + db "SPE@" + db "PRE@" + db "ESQ@" StatModifierRatios: ; 3f6cb (f:76cb) ; first byte is numerator, second byte is denominator diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index 34bc3119..4ea434b6 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -75,13 +75,13 @@ EndOfBattle: ; 137aa (4:77aa) ret YouWinText: ; 13853 (4:7853) - db "YOU WIN@" + db " GAGNE@" YouLoseText: ; 1385b (4:785b) - db "YOU LOSE@" + db " PERDU@" DrawText: ; 13864 (4:7864) - db " DRAW@" + db "MATCH NUL@" PickUpPayDayMoneyText: ; 1386b (4:786b) TX_FAR _PickUpPayDayMoneyText diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm index dfb2fe35..558ec623 100644 --- a/engine/battle/link_battle_versus_text.asm +++ b/engine/battle/link_battle_versus_text.asm @@ -13,9 +13,17 @@ DisplayLinkBattleVersusTextBox: ; 372d6 (d:72d6) call PlaceString ; place bold "VS" tiles between the names coord hl, 9, 8 - ld a, $69 - ld [hli], a - ld [hl], $6a + ld a, "C" + ld [hl], a + ld a, "O" + ld [hl], a + ld a, "N" + ld [hl], a + ld a, "T" + ld [hl], a + ld a, "R" + ld [hl], a + ld [hl], "E" xor a ld [wUpdateSpritesEnabled], a callab SetupPlayerAndEnemyPokeballs diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm index ceba63bd..b5c999e2 100644 --- a/engine/battle/save_trainer_name.asm +++ b/engine/battle/save_trainer_name.asm @@ -69,44 +69,44 @@ TrainerNamePointers: ; 27e64 (9:7e64) dw wTrainerName YoungsterName: ; 27ec2 (9:7ec2) - db "YOUNGSTER@" + db "GAMIN@" BugCatcherName: ; 27ecc (9:7ecc) - db "BUG CATCHER@" + db "SCOUT@" LassName: ; 27ed8 (9:7ed8) - db "LASS@" + db "FILLETTE@" JrTrainerMName: ; 27edd (9:7edd) - db "JR.TRAINER♂@" + db "DRESSEUR JR♂@" JrTrainerFName: ; 27ee9 (9:7ee9) - db "JR.TRAINER♀@" + db "DRESSEUR JR♀@" PokemaniacName: ; 27ef5 (9:7ef5) - db "POKéMANIAC@" + db "#MANIAC@" SuperNerdName: ; 27f00 (9:7f00) - db "SUPER NERD@" + db "INTELLO@" BurglarName: ; 27f0b (9:7f0b) - db "BURGLAR@" + db "PILLARD@" EngineerName: ; 27f13 (9:7f13) - db "ENGINEER@" + db "MECANO@" JugglerXName: ; 27f1c (9:7f1c) - db "JUGGLER@" + db "JONGLEUR@" SwimmerName: ; 27f24 (9:7f24) - db "SWIMMER@" + db "NAGEUR@" BeautyName: ; 27f2c (9:7f2c) - db "BEAUTY@" + db "CANON@" RockerName: ; 27f33 (9:7f33) db "ROCKER@" JugglerName: ; 27f3a (9:7f3a) - db "JUGGLER@" + db "JONGLEUR@" BlackbeltName: ; 27f42 (9:7f42) - db "BLACKBELT@" + db "KARATEKA@" ProfOakName: ; 27f4c (9:7f4c) - db "PROF.OAK@" + db "PROF.CHEN@" ChiefName: ; 27f55 (9:7f55) db "CHIEF@" ScientistName: ; 27f5b (9:7f5b) - db "SCIENTIST@" + db "SCIENTIFIQUE@" RocketName: ; 27f65 (9:7f65) db "ROCKET@" CooltrainerMName: ; 27f6c (9:7f6c) - db "COOLTRAINER♂@" + db "TOPDRESSEUR♂@" CooltrainerFName: ; 27f79 (9:7f79) - db "COOLTRAINER♀@" + db "TOPDRESSEUR♀@" diff --git a/engine/cable_club.asm b/engine/cable_club.asm index f2f881d8..7521f7d1 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -290,7 +290,7 @@ CableClub_DoBattleOrTradeAgain: ; 5345 jr CallCurrentTradeCenterFunction PleaseWaitString: ; 550f (1:550f) - db "PLEASE WAIT!@" + db "ATTENDEZ SVP@" CallCurrentTradeCenterFunction: ld hl, TradeCenterPointerTable @@ -533,7 +533,7 @@ TradeCenter_SelectMon: ld [wTradeCenterPointerTableIndex], a jp CallCurrentTradeCenterFunction .statsTrade - db "STATS TRADE@" + db "STATS ECHANGE@" .selectedCancelMenuItem ld a, [wCurrentMenuItem] ld b, a @@ -609,7 +609,7 @@ TradeCenter_DrawCancelBox: jp PlaceString CancelTextString: - db "CANCEL@" + db "ANNULER@" TradeCenter_PlaceSelectedEnemyMonMenuCursor: ld a, [wSerialSyncAndExchangeNybbleReceiveData] @@ -876,11 +876,11 @@ WillBeTradedText: ; 5a24 (1:5a24) db "@" TradeCompleted: - db "Trade completed!@" + db "ECHANGE TERMINE!@" TradeCanceled: - db "Too bad! The trade" - next "was canceled!@" + db "Dommage! L'échange" + next "est annulé!@" TradeCenterPointerTable: ; 5a5b (1:5a5b) dw TradeCenter_SelectMon diff --git a/engine/evolve_trade.asm b/engine/evolve_trade.asm index 81e41166..4924de1b 100755 --- a/engine/evolve_trade.asm +++ b/engine/evolve_trade.asm @@ -17,18 +17,19 @@ EvolveTradeMon: ; 17d7d (5:7d7d) ; This was fixed in Yellow. - ld a, [wInGameTradeReceiveMonName] + ;ld a, [wInGameTradeReceiveMonName] ; GRAVELER - cp "G" - jr z, .ok + ;cp "G" + ;jr z, .ok ; "SPECTRE" (HAUNTER) - cp "S" - ret nz - ld a, [wInGameTradeReceiveMonName + 1] - cp "P" - ret nz + ;cp "S" + ;ret nz + ;ld a, [wInGameTradeReceiveMonName + 1] + ;cp "P" + ;ret nz + ret .ok ld a, [wPartyCount] diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 7ab0637b..24425685 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -445,11 +445,11 @@ BillsHousePokemonListText1: ; 1ec7f (7:6c7f) db "@" BillsMonListText: ; 1ec84 (7:6c84) - db "EEVEE" - next "FLAREON" - next "JOLTEON" - next "VAPOREON" - next "CANCEL@" + db "EVOLI" + next "PYROLI" + next "VOLTALI" + next "AQUALI" + next "RETOUR@" BillsHousePokemonListText2: ; 1ecaa (7:6caa) TX_FAR _BillsHousePokemonListText2 diff --git a/engine/items/items.asm b/engine/items/items.asm index 1dd0a6f7..4d8ac893 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -823,8 +823,8 @@ ItemUseMedicine: ; dabb (3:5abb) ld [wActionResultOrTookBattleTurn],a ; item use failed jp PrintText .emptyPartyText - text "You don't have" - line "any #MON!" + text "Vous n'avez pas" + line "de #MON!" prompt .notUsingSoftboiled call DisplayPartyMenu @@ -1423,11 +1423,11 @@ VitaminNoEffectText: ; df29 (3:5f29) db "@" VitaminText: ; df2e (3:5f2e) - db "HEALTH@" - db "ATTACK@" - db "DEFENSE@" - db "SPEED@" - db "SPECIAL@" + db "VIE@" + db "FOR@" + db "DEF@" + db "VIT@" + db "SPE@" ItemUseBait: ; df52 (3:5f52) ld hl,ThrewBaitText diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 0be2e6b0..09dc73fe 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -85,12 +85,12 @@ DisplayPCMainMenu:: ; 213c8 (8:53c8) ld [H_AUTOBGTRANSFERENABLED], a ret -SomeonesPCText: db "SOMEONE's PC@" -BillsPCText: db "BILL's PC@" -PlayersPCText: db "'s PC@" -OaksPCText: db "PROF.OAK's PC@" -PKMNLeaguePCText: db $4a, "LEAGUE@" -LogOffPCText: db "LOG OFF@" +SomeonesPCText: db "PC DE ???@" +BillsPCText: db "PC DE LEO@" +PlayersPCText: db "PC DE @" +OaksPCText: db "PC DE CHEN@" +PKMNLeaguePCText: db "LIGUE ", $4a, "@" +LogOffPCText: db "DECONNEXION@" BillsPC_:: ; 0x214c2 ld hl, wd730 @@ -339,15 +339,15 @@ DisplayMonListMenu: ; 216be (8:56be) ret BillsPCMenuText: ; 216e1 (8:56e1) - db "WITHDRAW ", $4a - next "DEPOSIT ", $4a - next "RELEASE ", $4a - next "CHANGE BOX" - next "SEE YA!" + db "RETIRER ", $4a + next "STOCKER ", $4a + next "RELACHER ", $4a + next "CHANGER BOITE" + next "SALUT!" db "@" BoxNoPCText: ; 21713 (8:5713) - db "BOX No.@" + db "BOITE@" KnowsHMMove:: ; 2171b (8:571b) ; returns whether mon with party index [wWhichPokemon] knows an HM move @@ -451,11 +451,11 @@ DisplayDepositWithdrawMenu: ; 2174b (8:574b) call LoadGBPal jr .loop -DepositPCText: db "DEPOSIT@" -WithdrawPCText: db "WITHDRAW@" +DepositPCText: db "STOCKER@" +WithdrawPCText: db "RETIRER@" StatsCancelPCText: db "STATS" - next "CANCEL@" + next "RETOUR@" SwitchOnText: ; 0x217e9 TX_FAR _SwitchOnText diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 75458c5e..bdfec5d7 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -329,16 +329,16 @@ SpecialEnterMap: ; 5d5f (1:5d5f) jp EnterMap ContinueText: ; 5d7e (1:5d7e) - db "CONTINUE", $4e + db "CONTINUER", $4e NewGameText: ; 5d87 (1:5d87) - db "NEW GAME", $4e - db "OPTION@" + db "NOUVEAU JEU", $4e + db "OPTIONS@" CableClubOptionsText: ; 5d97 (1:5d97) - db "TRADE CENTER", $4e - db "COLOSSEUM", $4e - db "CANCEL@" + db "CENTRE TROC", $4e + db "COLISEE", $4e + db "RETOUR@" DisplayContinueGameInfo: ; 5db5 (1:5db5) xor a @@ -421,10 +421,10 @@ PrintPlayTime: ; 5e55 (1:5e55) jp PrintNumber SaveScreenInfoText: ; 5e6a (1:5e6a) - db "PLAYER" - next "BADGES " - next "#DEX " - next "TIME@" + db "JOUEUR" + next "BADGES " + next "#DEX " + next "TEMPS@" DisplayOptionMenu: ; 5e8a (1:5e8a) coord hl, 0, 0 @@ -578,20 +578,20 @@ DisplayOptionMenu: ; 5e8a (1:5e8a) ld [wOptionsTextSpeedCursorX],a ; text speed cursor X coordinate jp .eraseOldMenuCursor -TextSpeedOptionText: ; 5fc0 (1:5fc0) - db "TEXT SPEED" - next " FAST MEDIUM SLOW@" +TextSpeedOptionText: ; 6058 (1:6058) + db "VIT. TEXTE" + next " 3 2 1 @" BattleAnimationOptionText: ; 5fde (1:5fde) - db "BATTLE ANIMATION" - next " ON OFF@" + db "ANIMATION COMBAT" + next " OUI NON@" BattleStyleOptionText: ; 5ffd (1:5ffd) - db "BATTLE STYLE" - next " SHIFT SET@" + db "STYLE COMBAT" + next " CHOIX DEFINI@" OptionMenuCancelText: ; 6018 (1:6018) - db "CANCEL@" + db "RETOUR@" ; sets the options variable according to the current placement of the menu cursors in the options menu SetOptionsFromCursorPositions: ; 601f (1:601f) diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 41f63095..3e0e49c5 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -323,13 +323,16 @@ DisplayNamingScreen: ; 6596 (1:6596) ld [wTopMenuItemX], a jp EraseMenuCursor -LoadEDTile: ; 675b (1:675b) - ld de, ED_Tile - ld hl, vFont + $700 - ld bc, (ED_TileEnd - ED_Tile) / $8 +LoadEDTile: ; 67f6 (1:67f6) + call DisableLCD + ld de, vFont + $700 + ld hl, ED_Tile + ld bc, (ED_TileEnd - ED_Tile) ; to fix the graphical bug on poor emulators - ;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) / $8 - jp CopyVideoDataDouble + ;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) + ld a,$01 + call FarCopyDataDouble + jp EnableLCD ED_Tile: ; 6767 (1:6767) INCBIN "gfx/ED_tile.1bpp" @@ -365,13 +368,13 @@ PrintAlphabet: ; 676f (1:676f) ld [H_AUTOBGTRANSFERENABLED], a jp Delay3 -LowerCaseAlphabet: ; 679e (1:679e) - db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥UPPER CASE@" +LowerCaseAlphabet: ; 6841 (1:6841) + db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥MAJUSCULES@" -UpperCaseAlphabet: ; 67d6 (1:67d6) - db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥lower case@" +UpperCaseAlphabet: ; 6879 (1:6879) + db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥minuscules@" -PrintNicknameAndUnderscores: ; 680e (1:680e) +PrintNicknameAndUnderscores: ; 68b1 (1:68b1) call CalcStringLength ld a, c ld [wNamingScreenNameLength], a @@ -467,15 +470,15 @@ CalcStringLength: ; 68eb (1:68eb) inc c jr .loop -PrintNamingText: ; 68f8 (1:68f8) +PrintNamingText: ; 699b (1:699b) coord hl, 0, 1 ld a, [wNamingScreenType] ld de, YourTextString and a - jr z, .notNickname + jr z, .placeString ld de, RivalsTextString dec a - jr z, .notNickname + jr z, .placeString ld a, [wcf91] ld [wMonPartySpriteSpecies], a push af @@ -485,28 +488,21 @@ PrintNamingText: ; 68f8 (1:68f8) call GetMonName coord hl, 4, 1 call PlaceString - ld hl, $1 - add hl, bc - ld [hl], $c9 - coord hl, 1, 3 - ld de, NicknameTextString + ld hl, $C3DD + ld de, $69F2 jr .placeString -.notNickname - call PlaceString - ld l, c - ld h, b - ld de, NameTextString + .placeString jp PlaceString YourTextString: ; 693f (1:693f) - db "YOUR @" + db "VOTRE NOM?@" RivalsTextString: ; 6945 (1:6945) - db "RIVAL's @" + db "NOM DU RIVAL?@" NameTextString: ; 694d (1:694d) - db "NAME?@" + db "NOM?@" NicknameTextString: ; 6953 (1:6953) - db "NICKNAME?@" + db "SURNOM?@" diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm index 00889e93..a9d61a74 100755 --- a/engine/menu/players_pc.asm +++ b/engine/menu/players_pc.asm @@ -1,6 +1,4 @@ PlayerPC: ; 78e6 (1:78e6) - ld hl, wd730 - set 6, [hl] ld a, ITEM_NAME ld [wNameListType], a call SaveScreenTilesToBuffer1 @@ -15,6 +13,8 @@ PlayerPC: ; 78e6 (1:78e6) call PlaySound ld hl, TurnedOnPC2Text call PrintText + ld hl, wd730 + set 6, [hl] PlayerPCMenu: ; 790c (1:790c) ld a, [wParentMenuItem] @@ -240,11 +240,11 @@ PlayerPCToss: ; 7a8f (1:7a8f) call TossItem ; disallows tossing key items jp .loop -PlayersPCMenuEntries: ; 7af5 (1:7af5) - db "WITHDRAW ITEM" - next "DEPOSIT ITEM" - next "TOSS ITEM" - next "LOG OFF@" +PlayersPCMenuEntries: ; 7b5f (1:7b5f) + db "RETIRER OBJET" + next "STOCKER OBJET" + next "JETER OBJET" + next "DECONNEXION@" TurnedOnPC2Text: ; 7b22 (1:7b22) TX_FAR _TurnedOnPC2Text diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 3898ef43..adf0eb62 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -355,19 +355,19 @@ DrawPokedexVerticalLine: ; 4028e (10:428e) ret PokedexSeenText: ; 4029d (10:429d) - db "SEEN@" + db "VUS@" PokedexOwnText: ; 402a2 (10:42a2) - db "OWN@" + db "PRIS@" PokedexContentsText: ; 402a6 (10:42a6) - db "CONTENTS@" + db "SOMMAIRE@" PokedexMenuItemsText: ; 402af (10:42af) - db "DATA" - next "CRY" - next "AREA" - next "QUIT@" + db "INFO" + next "CRI" + next "ZONE" + next "RET@" ; tests if a pokemon's bit is set in the seen or owned pokemon bit fields ; INPUT: @@ -493,23 +493,34 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) jp z,.waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description inc de ; de = address of feet (height) ld a,[de] ; reads feet, but a is overwritten without being used + push af coord hl, 12, 6 lb bc, 1, 2 call PrintNumber ; print feet (height) - ld a,$60 ; feet symbol tile (one tick) - ld [hl],a - inc de - inc de ; de = address of inches (height) - coord hl, 15, 6 - lb bc, LEADING_ZEROES | 1, 2 - call PrintNumber ; print inches (height) - ld a,$61 ; inches symbol tile (two ticks) - ld [hl],a -; now print the weight (note that weight is stored in tenths of pounds internally) + ld hl, $C426 + pop af + cp $a + jr nc, .func_43d7 + ld [hl], $F6 +.func_43d7 + inc hl + ld a, [hli] + ldd [hl], a + ld [hl], $F2 inc de inc de - inc de ; de = address of upper byte of weight + inc de ; de = address of inches (height) push de +; coord hl, 15, 6 +; lb bc, LEADING_ZEROES | 1, 2 +; call PrintNumber ; print inches (height) +; ld a,$61 ; inches symbol tile (two ticks) +; ld [hl],a +; now print the weight (note that weight is stored in tenths of pounds internally) +; inc de +; inc de +; inc de ; de = address of upper byte of weight +; push de ; put weight in big-endian order at hDexWeight ld hl,hDexWeight ld a,[hl] ; save existing value of [hDexWeight] @@ -568,7 +579,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ret HeightWeightText: ; 40448 (10:4448) - db "HT ?",$60,"??",$61,$4E,"WT ???lb@" + db "TAI ???",$60,$4e,"PDS ???",$61,$62,"@" ; XXX does anything point to this? PokeText: ; 4045d (10:445d) diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 34c21da0..12b1441f 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -598,8 +598,9 @@ DrawTrainerInfo: ; 1349a (4:749a) call PlaceString coord hl, 8, 4 ld de,wPlayerMoney - ld c,$e3 + ld c,$c3 call PrintBCDNumber + ld [hl],$f0 coord hl, 9, 6 ld de,wPlayTimeHours ; hours lb bc, LEFT_ALIGN | 1, 3 @@ -614,10 +615,10 @@ TrainerInfo_FarCopyData: ; 1357f (4:757f) ld a,BANK(TrainerInfoTextBoxTileGraphics) jp FarCopyData2 -TrainerInfo_NameMoneyTimeText: ; 13584 (4:7584) - db "NAME/" - next "MONEY/" - next "TIME/@" +TrainerInfo_NameMoneyTimeText: ; 13584 (4:7594) + db "NOM/" + next "ARG./" + next "TEMPS/@" ; $76 is a circle tile TrainerInfo_BadgesText: ; 13597 (4:7597) diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index d07cc026..c529b9e5 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -288,10 +288,10 @@ PrintStat ret StatsText: ; 12b3a (4:6b3a) - db "ATTACK" - next "DEFENSE" - next "SPEED" - next "SPECIAL@" + db "FOR" + next "DEF" + next "VIT" + next "SPE@" StatusScreen2: ; 12b57 (4:6b57) ld a, [hTilesetType] @@ -462,8 +462,8 @@ CalcExpToLevelUp: ; 12c86 (4:6c86) ret StatusScreenExpText: ; 12caf (4:6caf) - db "EXP POINTS" - next "LEVEL UP@" + db "PTS EXP." + next "PROCH.NIV.@" StatusScreen_ClearName: ; 12cc3 (4:6cc3) ld bc, 10 @@ -478,3 +478,13 @@ StatusScreen_PrintPP: ; 12ccb (4:6ccb) dec c jr nz, StatusScreen_PrintPP ret + +func_6cd5: ; 12cd5 (4:6cd5) + ld a, $80 + ld [hli],a + ld a, $8F + ldd [hl], a + add hl, de + dec c + jr nz, func_6cd5 + ret
\ No newline at end of file diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index d58aef83..88670a16 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -184,38 +184,38 @@ DisplayIntroNameTextBox: ; 6a6c (1:6a6c) ld [wMaxMenuItem], a jp HandleMenuInput -.namestring ; 6aa3 (1:6aa3) - db "NAME@" +.namestring ; 6b40 (1:6b40) + db "─NOM@" IF DEF(_RED) DefaultNamesPlayer: ; 6aa8 (1:6aa8) - db "NEW NAME" + db "NOM:" next "RED" - next "ASH" - next "JACK" + next "SACHA" + next "PAUL" db "@" DefaultNamesRival: ; 6abe (1:6abe) - db "NEW NAME" + db "NOM:" next "BLUE" - next "GARY" - next "JOHN" + next "REGIS" + next "JEAN" db "@" ENDC IF DEF(_BLUE) DefaultNamesPlayer: ; 6aa8 (1:6aa8) - db "NEW NAME" + db "NOM:" next "BLUE" - next "GARY" - next "JOHN" + next "REGIS" + next "JEAN" db "@" DefaultNamesRival: ; 6abe (1:6abe) - db "NEW NAME" + db "NOM:" next "RED" - next "ASH" - next "JACK" + next "SACHA" + next "PAUL" db "@" ENDC @@ -245,27 +245,27 @@ GetDefaultName: ; 6ad6 (1:6ad6) IF DEF(_RED) DefaultNamesPlayerList: ; 6af2 (1:6af2) - db "NEW NAME@" + db "NOM:@" db "RED@" - db "ASH@" - db "JACK@" + db "SACHA@" + db "PAUL@" DefaultNamesRivalList: ; 6b08 (1:6b08) - db "NEW NAME@" + db "NOM:@" db "BLUE@" - db "GARY@" - db "JOHN@" + db "REGIS@" + db "JEAN@" ENDC IF DEF(_BLUE) DefaultNamesPlayerList: ; 6af2 (1:6af2) - db "NEW NAME@" + db "NOM:@" db "BLUE@" - db "GARY@" - db "JOHN@" + db "REGIS@" + db "JEAN@" DefaultNamesRivalList: ; 6b08 (1:6b08) - db "NEW NAME@" + db "NOM:@" db "RED@" - db "ASH@" - db "JACK@" + db "SACHA@" + db "PAUL@" ENDC TextTerminator_6b20: ; 6b20 (1:6b20) diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 2af2e518..7f92a243 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -445,6 +445,7 @@ InitializeSpriteStatus: ; 50ad (1:50ad) ld a, $8 ld [hli], a ; $c2x2: set Y displacement to 8 ld [hl], a ; $c2x3: set X displacement to 8 + call InitializeSpriteScreenPosition ; could have done fallthrough here ret ; calculates the spprite's scrren position form its map position and the player position @@ -457,7 +458,7 @@ InitializeSpriteScreenPosition: ; 50bd (1:50bd) ld b, a ld a, [hl] ; c2x4 (Y position + 4) sub b ; relative to player position - swap a ; * 16 + call Func_515D sub $4 ; - 4 dec h ld [hli], a ; c1x4 (screen Y position) @@ -466,11 +467,23 @@ InitializeSpriteScreenPosition: ; 50bd (1:50bd) ld b, a ld a, [hli] ; c2x6 (X position + 4) sub b ; relative to player position - swap a ; * 16 + call Func_515D dec h ld [hl], a ; c1x6 (screen X position) ret +Func_515D: ; 515D (1:515D) + jr nc, .asm_5166 + cpl + inc a + swap a + cpl + inc a + ret +.asm_5166 + swap a + ret + ; tests if sprite is off screen or otherwise unable to do anything CheckSpriteAvailability: ; 50dc (1:50dc) predef IsObjectHidden diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index cbe19d6d..704388fa 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -111,7 +111,7 @@ DisplayTitleScreen: ; 42dd (1:42dd) jr .next .tileScreenCopyrightTiles ; 437f (1:437f) - db $41,$42,$43,$42,$44,$42,$45,$46,$47,$48,$49,$4A,$4B,$4C,$4D,$4E ; ©'95.'96.'98 GAME FREAK inc. + db $41,$42,$43,$44,$42,$43,$4f,$46,$47,$48,$49,$4A,$4B,$4C,$4D,$4E ; ©1995-1999 GAME FREAK inc. .next call SaveScreenTilesToBuffer2 @@ -377,9 +377,9 @@ LoadCopyrightTiles: ; 4541 (1:4541) jp PlaceString CopyrightTextString: ; 4556 (1:4556) - db $60,$61,$62,$61,$63,$61,$64,$7F,$65,$66,$67,$68,$69,$6A ; ©'95.'96.'98 Nintendo - next $60,$61,$62,$61,$63,$61,$64,$7F,$6B,$6C,$6D,$6E,$6F,$70,$71,$72 ; ©'95.'96.'98 Creatures inc. - next $60,$61,$62,$61,$63,$61,$64,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B ; ©'95.'96.'98 GAME FREAK inc. + db $60,$61,$62,$63,$61,$62,$7C,$7F,$65,$66,$67,$68,$69,$6A ; ©1995-1999 Nintendo + next $60,$61,$62,$63,$61,$62,$7C,$7F,$6B,$6C,$6D,$6E,$6F,$70,$71,$72 ; ©1995-1999 Creatures inc. + next $60,$61,$62,$63,$61,$62,$7C,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B ; ©1995-1999 GAME FREAK inc. db "@" INCLUDE "data/title_mons.asm" @@ -393,7 +393,7 @@ PrintGameVersionOnTitleScreen: ; 4598 (1:4598) ; these point to special tiles specifically loaded for that purpose and are not usual text VersionOnTitleScreenText: ; 45a1 (1:45a1) IF DEF(_RED) - db $60,$61,$7F,$65,$66,$67,$68,$69,"@" ; "Red Version" + db $60,$61,$62,$63,$64,$65,$66,$67,$68,$69,"@" ; "Version Rouge" ENDC IF DEF(_BLUE) db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Blue Version" 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 @@ -490,11 +490,9 @@ PrintStatusCondition:: ; 14e1 (0:14e1) 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 PrintStatusConditionNotFainted: ; 14f6 @@ -1264,14 +1262,26 @@ PokemonFaintedText:: ; 2aa4 (0:2aa4) TX_FAR _PokemonFaintedText db "@" -DisplayPlayerBlackedOutText:: ; 2aa9 (0:2aa9) +DisplayPlayerBlackedOutText:: ; 2aa5 (0:2aa5) ld hl,PlayerBlackedOutText call PrintText 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:: ; 2aba (0:2aba) TX_FAR _PlayerBlackedOutText db "@" @@ -1580,6 +1590,8 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57) ld a,[wListMenuID] cp a,PRICEDITEMLISTMENU jr nz,.printInitialQuantity + ld a,"¥" + ld [$C47A],a coord hl, 8, 10 .printInitialQuantity ld de,InitialQuantityText @@ -1790,6 +1802,7 @@ PrintListMenuEntries:: ; 2e5a (0:2e5a) 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 @@ -1893,7 +1906,7 @@ PrintListMenuEntries:: ; 2e5a (0:2e5a) jp PlaceString ListMenuCancelText:: ; 2f97 (0:2f97) - db "CANCEL@" + db "RETOUR@" GetMonName:: ; 2f9e (0:2f9e) push hl @@ -2000,9 +2013,9 @@ GetMachineName:: ; 2ff3 (0:2ff3) ret TechnicalPrefix:: ; 303c (0:303c) - db "TM" + db "CT" HiddenPrefix:: ; 303e (0:303e) - 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 a9e7cd60..59ab34d7 100644 --- a/home/text.asm +++ b/home/text.asm @@ -225,23 +225,23 @@ FinishDTE:: ; 1a4b (0:1a4b) jp PlaceNextChar Char5CText:: ; 1a55 (0:1a55) - db "TM@" + db "PC@" Char5DText:: ; 1a58 (0:1a58) - db "TRAINER@" + db "ROCKET@" Char5BText:: ; 1a60 (0:1a60) - db "PC@" + db "……@" Char5EText:: ; 1a63 (0:1a63) - db "ROCKET@" + db $E1,$E2,"@" ; PKMN Char54Text:: ; 1a6a (0:1a6a) - db "POKé@" + db "CT@" Char56Text:: ; 1a6f (0:1a6f) - db "……@" + db "DRES.@" Char5AText:: ; 1a72 (0:1a72) - db "Enemy @" -Char4AText:: ; 1a79 (0:1a79) - db $E1,$E2,"@" ; PKMN + db "POKé@" +Char4AText:: ; 1a70 (0:1a70) + db " ennemi@" -Char55:: ; 1a7c (0:1a7c) +Char55:: ; 1a78 (0:1a78) push de ld b,h ld c,l @@ -258,19 +258,19 @@ Char55Text:: ; 1a8c (0:1a8c) TX_FAR _Char55Text db "@" -Char5F:: ; 1a91 (0:1a91) +Char5F:: ; 1a8d (0:1a8d) ; ends a Pokédex entry ld [hl],"." pop hl ret -Char58:: ; 1a95 (0:1a95) +Char58:: ; 1a91 (0:1a91) ld a,[wLinkState] cp LINK_STATE_BATTLING jp z,Next1AA2 ld a,$EE Coorda 18, 16 -Next1AA2:: ; 1aa2 (0:1aa2) +Next1AA2:: ; 1a9e (0:1a9e) call ProtectedDelay3 call ManualTextScroll ld a, " " @@ -176,7 +176,7 @@ PrintWaitingText: jp DelayFrames WaitingText: - db "Waiting...!@" + db "UN MOMENT…@" _UpdateSprites: ; 4c34 (1:4c34) @@ -1130,22 +1130,22 @@ DrawStartMenu: ; 710b (1:710b) ret StartMenuPokedexText: ; 718f (1:718f) - db "POKéDEX@" + db "#DEX@" StartMenuPokemonText: ; 7197 (1:7197) - db "POKéMON@" + db "#MON@" StartMenuItemText: ; 719f (1:719f) - db "ITEM@" + db "OBJET@" StartMenuSaveText: ; 71a4 (1:71a4) - db "SAVE@" + db "SAUVER@" StartMenuResetText: ; 71a9 (1:71a9) - db "RESET@" + db "QUITTER@" StartMenuExitText: ; 71af (1:71af) - db "EXIT@" + db "RETOUR@" StartMenuOptionText: ; 71b4 (1:71b4) db "OPTION@" @@ -1324,7 +1324,7 @@ TextBoxCoordTable: ; 7391 (1:7391) TextBoxTextAndCoordTable: ; 73b0 (1:73b0) 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: ; 73b0 (1:73b0) 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,66 +1369,42 @@ TextBoxTextAndCoordTable: ; 73b0 (1:73b0) 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: ; 7413 (1:7413) - db "BUY" - next "SELL" - next "QUIT@@" + db "@ACHETER" + next "VENDRE" + next "SALUT!@" UseTossText: ; 7422 (1:7422) - db "USE" - next "TOSS@" - -JapaneseSaveMessageText: ; 742b (1:742b) - db "きろく" - next "メッセージ@" - -JapaneseSpeedOptionsText: ; 7435 (1:7435) - db "はやい" - next "おそい@" + db "UTIL." + next "JETER@" MoneyText: ; 743d (1:743d) - db "MONEY@" - -JapaneseMochimonoText: ; 7443 (1:7443) - db "もちもの@" - -JapaneseMainMenuText: ; 7448 (1:7448) - db "つづきから" - next "さいしょから@" + db "ARG.@" BattleMenuText: ; 7455 (1:7455) - db "FIGHT ",$E1,$E2 - next "ITEM RUN@" + db "ATTAQ ",$e1,$e2 + next "OBJET FUITE@" SafariZoneBattleMenuText: ; 7468 (1:7468) - db "BALL× BAIT" - next "THROW ROCK RUN@" + db "BALL× APPAT" + next "CAILLOU FUITE@" SwitchStatsCancelText: ; 7489 (1:7489) - db "SWITCH" + db "ORDRE" next "STATS" - next "CANCEL@" - -JapaneseAhText: ; 749d (1:749d) - db "アッ!@" - -JapanesePokedexMenu: ; 74a1 (1:74a1) - db "データをみる" - next "なきごえ" - next "ぶんぷをみる" - next "キャンセル@" + next "RETOUR@" -DisplayMoneyBox: ; 74ba (1:74ba) +DisplayMoneyBox: ; 7519 (1:7519) ld hl, wd730 set 6, [hl] ld a, MONEY_BOX_TEMPLATE @@ -1440,13 +1416,16 @@ DisplayMoneyBox: ; 74ba (1:74ba) 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 -CurrencyString: ; 74e2 (1:74e2) +CurrencyString: ; 754a (1:754a) db " ¥@" DoBuySellQuitMenu: ; 74ea (1:74ea) @@ -1701,20 +1680,20 @@ TwoOptionMenuStrings: ; 7671 (1:7671) db 4,3,0 dw .NoYesMenu -.NoYesMenu ; 7699 (1:3699) - db "NO",$4E,"YES@" -.YesNoMenu ; 76a0 (1:36a0) - db "YES",$4E,"NO@" .NorthWestMenu ; 76a7 (1:36a7) db "NORTH",$4E,"WEST@" .SouthEastMenu ; 76b2 (1:36b2) db "SOUTH",$4E,"EAST@" .NorthEastMenu ; 76bd (1:36bd) db "NORTH",$4E,"EAST@" +.NoYesMenu ; 7699 (1:3699) + db "NON",$4E,"OUI@" +.YesNoMenu ; 76a0 (1:36a0) + db "OUI",$4E,"NON@" .TradeCancelMenu ; 76c8 (1:36c8) - db "TRADE",$4E,"CANCEL@" + db "ECHANGE",$4E,"RETOUR@" .HealCancelMenu ; 76d5 (1:36d5) - db "HEAL",$4E,"CANCEL@" + db "SOIN",$4E,"RETOUR@" DisplayFieldMoveMonMenu: ; 76e1 (1:76e1) xor a @@ -1837,20 +1816,20 @@ DisplayFieldMoveMonMenu: ; 76e1 (1:76e1) jp PlaceString FieldMoveNames: ; 778d (1:778d) - 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: ; 77c2 (1:77c2) db "STATS" - next "SWITCH" - next "CANCEL@" + next "ORDRE" + next "RETOUR@" GetMonFieldMoves: ; 77d6 (1:77d6) ld a, [wWhichPokemon] diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm index e639caf9..32351289 100755 --- a/scripts/bikeshop.asm +++ b/scripts/bikeshop.asm @@ -79,11 +79,11 @@ BikeShopText1: ; 1d745 (7:5745) jp TextScriptEnd BikeShopMenuText: ; 1d7f8 (7:57f8) - db "BICYCLE" - next "CANCEL@" + db "BICYCLETTE" + next "RETOUR@" BikeShopMenuPrice: ; 1d807 (7:5807) - db "¥1000000@" + db "1000000¥@" BikeShopText_1d810: ; 1d810 (7:5810) TX_FAR _BikeShopText_1d810 diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index 28fa1cc3..4dcfe790 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -277,6 +277,8 @@ PewterCityText_19431: ; 19431 (6:5431) PewterCityText5: ; 19436 (6:5436) 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 3c0f4c49..9db8db46 100755 --- a/text/item_names.asm +++ b/text/item_names.asm @@ -1,98 +1,98 @@ -ItemNames: ; 472b (1:472b) +ItemNames: ; 472d (1:472d) 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 c7e0226f..4bf3e6d0 100755 --- a/text/monster_names.asm +++ b/text/monster_names.asm @@ -1,191 +1,191 @@ MonsterNames: ; 1c21e (7:421e) - 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 6a3cf8f7..8cf1d845 100755 --- a/text/trainer_names.asm +++ b/text/trainer_names.asm @@ -1,48 +1,48 @@ TrainerNames: ; 399ff (e:59ff) - 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@" |
