thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

oh my god why did i forget to push this

Browse source 
- Added LuciShrimp's amazing demake of the Area Zero theme! Plays in Mt. Moon Crater.

- Lickilicky now has access to Explosion and Selfdestruct.

- Sirfetch'd forgot how to Fly.

- Steelix is now even more susceptible to getting BubbleBeamed to death since it now has 10 less base Special.

- Small changes to a handful of trainer parties.

- Changed some encounter tables, mainly making Ramoose more scarce and Tangela more common.

- Blissey, Magmortar and Rhyperior all receieved updated sprites by Albatross!

- Jynx also receieved an updated sprite, giving it the purple skin it has in later generations.

- Minor level changes.

- Updated README.
This commit is contained in:
Martha Schilling 2023-11-03 13:20:31 +00:00
parent 6496a46d1d
commit 9c35a2c12c
27 changed files with 4470 additions and 363 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -120,6 +120,7 @@ New Music
- Mewtwo has its own battle theme: A demake of the iconic Stadium track! It features some creative deviations to give it a distinct Game Boy feel while fitting with Mewtwo's mystique. Composed by LuciShrimp.
- Mew and the Legendary Birds have their own battle theme, a demake of the FireRed/LeafGreen pitch-shifted remix. Not simply pitching it up, percussion elements have been added to give it that rustic FRLG "feel" that distinguishes it from the original games. Composed by LuciShrimp.
- Limited static encounters, such as the two sleeping Snorlax, and the restored prototype Omega, also use this theme.
- Mt. Moon Crater uses a demake of Scarlet and Violet's Area Zero theme! Composed by LuciShrimp.
- Pokemon Yellow's various tracks have been backported, such as Jessie and James's encounter theme.
- Several pieces of unused music, including Digda01, Victory4, Field6, Kincho01, and Giovanni's theme have been implemented.
- A remix of the unused Koukan (trading) music is also used as a town theme. Composed by BGVC.
@ -380,6 +381,7 @@ If you use our implementations of anything at all, it is encouraged to submit Pu
* erosunica - Assistance with developing Celadon University & Citrine City, plus sources for various subjects.
* Chatot4444 - Assisting with gym scaling code.
* Enigami - Reworking the Battle Tent's RestoreTeam code to make it work properly.
* LadyMisticus - Made a well-documented spreadsheet for the hack that details every Pokemon's stats, movepools and locations, plus more!
* Ness the Unexplained - Helped with writing NPC dialogue and Pokédex entries for new Pokémon such as Gyopin.
* ZumiIsawhat? - Restorations of beta OST.
* FrenchOrange - Reconstructions of various overworld beta sprites.

2
audio.asm
View file

@ -331,7 +331,7 @@ INCLUDE "crysaudio/music/RBY/lavender.asm"
INCLUDE "crysaudio/music/RBY/safarizone.asm"
INCLUDE "crysaudio/music/RBY/gym.asm"
INCLUDE "crysaudio/music/RBY/pokecenter.asm"
INCLUDE "crysaudio/music/RBY/lavenbar.asm"
INCLUDE "crysaudio/music/RBY/areazero.asm"
INCLUDE "crysaudio/music/RBY/citrine.asm"

2
constants/music_constants.asm
View file

@ -27,7 +27,7 @@
const MUSIC_ROUTES3
const MUSIC_ROUTES4
const MUSIC_INDIGO_PLATEAU
const MUSIC_LAVENBAR
const MUSIC_AREA_ZERO
const MUSIC_CITRINE
const MUSIC_GYM_LEADER_BATTLE

4374
crysaudio/music/RBY/areazero.asm Normal file
View file

File diff suppressed because it is too large Load diff

269
crysaudio/music/RBY/lavenbar.asm
View file

@ -1,269 +0,0 @@
Music_Lavenbar::
channel_count 4
channel 1, Music_Lavenbar_Ch1
channel 2, Music_Lavenbar_Ch2
channel 3, Music_Lavenbar_Ch3
channel 4, Music_Lavenbar_Ch4
Music_Lavenbar_Ch1::
tempo 152
volume 7, 7
duty_cycle 1
toggle_perfect_pitch
vibrato 0, 8, 8
note_type 12, 8, 7
note_type 12, 10, 7
Music_Lavenbar_branch_bb6b::
octave 3
note G_, 8
note G_, 8
note E_, 8
note E_, 8
note G_, 4
note F#, 4
note E_, 4
note B_, 4
note C#, 8
note C#, 8
note G_, 8
note G_, 8
note F#, 8
note F#, 8
note B_, 4
note G_, 4
note F#, 4
note B_, 4
octave 4
note C_, 8
note C_, 8
octave 3
note G_, 8
note G_, 8
note E_, 8
note E_, 8
note G_, 4
note F#, 4
note E_, 4
note B_, 4
note C#, 8
note C#, 8
note G_, 8
note G_, 8
note F#, 8
note F#, 8
note B_, 4
note G_, 4
note F#, 4
note B_, 4
note C_, 8
note C_, 8
rest 16
rest 16
rest 16
rest 16
sound_loop 0, Music_Lavenbar_branch_bb6b
Music_Lavenbar_Ch2::
tempo 144
volume 7, 7
duty_cycle 3
vibrato 12, 3, 4
toggle_perfect_pitch
Music_Lavenbar_branch_b878::
note_type 12, 11, 5
rest 4
octave 3
note D_, 4
note E_, 6
note C#, 2
note_type 12, 11, 1
note D_, 4
note_type 12, 11, 5
note B_, 4
octave 4
note C_, 6
octave 3
note A_, 2
note_type 12, 11, 1
note B_, 4
note_type 12, 11, 5
note G_, 4
note F#, 4
note E_, 2
note F#, 2
note_type 12, 11, 1
note G_, 4
note_type 12, 11, 5
note G_, 4
note F#, 4
note E_, 4
note D_, 4
note E_, 4
note F#, 6
note A_, 2
note_type 12, 11, 1
note G_, 4
note_type 12, 11, 5
note B_, 4
octave 4
note C_, 6
octave 3
note A_, 2
note B_, 4
note G_, 4
note F#, 3 ; <- Starting here is too early...
note E_, 1 ; <- ...and starting here is too late?
note F#, 2
note A_, 2
note_type 12, 10, 2
note G_, 4
octave 4
note D_, 1
note E_, 1
note D_, 4
note_type 12, 7, 2
note D_, 1
note E_, 1
note D_, 4
note_type 12, 10, 7
octave 3
note B_, 6
note G_, 2
note E_, 8
octave 4
note C_, 6
octave 3
note A_, 2
note F#, 8
octave 4
note F#, 6
note D_, 2
octave 3
note B_, 2
note A_, 2
note G_, 2
note F#, 2
note G_, 8
note F#, 4
note E_, 4
sound_loop 0, Music_Lavenbar_branch_b878
Music_Lavenbar_Ch3::
vibrato 4, 1, 1
note_type 12, 3, 15
note_type 12, 2, 15
load_wave 2, 1, 14, 2, 3, 3, 2, 8, 14, 1, 2, 2, 15, 15, 14, 10, 1, 0, 1, 4, 13, 12, 1, 0, 14, 3, 4, 1, 5, 1, 7, 3
Music_Lavenbar_branch_bbb9::
octave 4
note E_, 16
note D_, 16
note C_, 16
note E_, 4
note C_, 4
octave 3
note B_, 4
octave 4
note E_, 4
note E_, 16
note D_, 16
note C_, 16
note E_, 4
note C_, 4
octave 3
note B_, 4
octave 4
note E_, 4
note E_, 16
note D_, 16
note C_, 16
note E_, 4
note C_, 4
octave 3
note B_, 4
octave 4
note E_, 4
note_type 12, 3, 15
octave 6
note B_, 4
note G_, 4
note F#, 4
note B_, 4
note_type 12, 2, 15
note B_, 4
note G_, 4
note F#, 4
note B_, 4
octave 7
note B_, 4
note G_, 4
note F#, 4
note B_, 4
octave 4
note E_, 4
note G_, 4
note F#, 4
note B_, 4
note E_, 16
note D_, 16
note C_, 16
note E_, 4
note C_, 4
octave 3
note B_, 4
octave 4
note E_, 4
note E_, 16
note D_, 16
note C_, 16
note E_, 4
note C_, 4
octave 3
note B_, 4
octave 4
note E_, 4
note E_, 16
note D_, 16
note C_, 16
note E_, 4
note C_, 4
octave 3
note B_, 4
octave 4
note E_, 4
note_type 12, 2, 15
octave 6
note B_, 4
note G_, 4
note F#, 4
note B_, 4
octave 7
note B_, 4
note G_, 4
note F#, 4
note B_, 4
octave 8
note B_, 4
note G_, 4
note F#, 4
note B_, 4
octave 4
note E_, 4
note G_, 4
note F#, 4
note B_, 4
sound_loop 0, Music_Lavenbar_branch_bbb9
Music_Lavenbar_Ch4::
toggle_noise 0
drum_speed 12
Music_Lavenbar_branch_bc26::
drum_note 7, 8
drum_note 7, 8
sound_loop 0, Music_Lavenbar_branch_bc26

2
crysaudio/music_pointers_red.asm
View file

@ -23,7 +23,7 @@ Music:
dba Music_Routes3
dba Music_Routes4
dba Music_RBYIndigoPlateau
dba Music_Lavenbar
dba Music_AreaZero
dba Music_Citrine
dba Music_GymLeaderBattle
dba Music_TrainerBattle

2
data/maps/songs.asm
View file

@ -120,7 +120,7 @@ MapSongBanks::
db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_72 / FARAWAY ISLAND INSIDE
db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_73 / FARAWAY ISLAND OUTSIDE
db MUSIC_CINNABAR_MANSION, 0 ; UNUSED_MAP_74 / POKEMON MANSION B2F
db MUSIC_VICTORY4, 0 ; UNUSED_MAP_75 / MT. MOON CRATER
db MUSIC_AREA_ZERO, 0 ; UNUSED_MAP_75 / MT. MOON CRATER
db MUSIC_PALLET_TOWN, 0 ; HALL_OF_FAME
db MUSIC_ROUTES1, 0 ; UNDERGROUND_PATH_NORTH_SOUTH
db MUSIC_INDIGO_PLATEAU, 0 ; CHAMPIONS_ROOM

5
data/pokemon/base_stats/lickilicky.asm
View file

@ -18,8 +18,9 @@
TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \
BLIZZARD, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \
RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \
MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, \
REST, SUBSTITUTE, CUT, SURF, STRENGTH
MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, FIRE_BLAST, \
SKULL_BASH, REST, EXPLOSION, SUBSTITUTE, CUT, \
SURF, STRENGTH
; end
db BANK(LickilickyPicFront)

3
data/pokemon/base_stats/sirfetchd.asm
View file

@ -17,8 +17,7 @@
tmhm RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, TOXIC, BODY_SLAM, \
TAKE_DOWN, DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, \
RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \
SWIFT, SKULL_BASH, REST, SUBSTITUTE, CUT, \
FLY
SWIFT, SKULL_BASH, REST, SUBSTITUTE, CUT
; end
db BANK(SirfetchdPicFront)

2
data/pokemon/base_stats/steelix.asm
View file

@ -1,6 +1,6 @@
db DEX_STEELIX ; pokedex id
db 75, 85, 200, 30, 65
db 75, 85, 200, 30, 55
; hp atk def spd spc
db STEEL, GROUND ; type

2
data/pokemon/palettes.asm
View file

@ -210,7 +210,7 @@ MonsterPalettes:
db PAL_GREENMON ; CACTORMUS
db PAL_PINKMON ; MR_MIME
db PAL_CYANMON ; MR_RIME
db PAL_REDBAR ; JYNX
db PAL_MEWMON ; JYNX
db PAL_BLUEMON ; BUU
db PAL_YELLOWMON ; ELECTABUZZ
db PAL_YELLOWMON ; ELECTIVIRE

18
data/trainers/parties.asm
View file

@ -221,15 +221,15 @@ JrTrainerFData:
db 62, BELLIGNAN, SEAKING, TANGROWTH, LUXWAN, BELLOSSOM, GOROCHU, 0
; I praise the PokeManiac for its variety. He mainly uses "endangered", bipedal Pokemon.
; Skimper seems appropriate here, as it's a baby iguana; these were often bought by those types in the 90s.
; Squeamata seems appropriate here, as it's a baby iguana; these were often bought by those types in the 90s.
PokemaniacData:
; Route 10
db 30, RHYHORN, LICKITUNG, 0
db 21, CHARMELEON, CUBONE, 0
; Rock Tunnel B1F
db 20, SLOWPOKE, LICKITUNG, RHYHORN, 0
db 20, SLOWPOKE, SQUEAMATA, RHYHORN, 0
db 22, CHARMANDER, CUBONE, 0
db 25, SQUEAMATA, 0
db 23, GAVILLAIN, 0
; Victory Road 2F
db 40, MINISTARE, LAPRAS, LICKILICKY, RHYDON, 0
; Rock Tunnel 1F
@ -346,7 +346,7 @@ EngineerData:
db 21, KOTORA, VOLTORB, 0
db 18, MAGNEMITE, MAGNEMITE, PIKACHU, 0
; Silph Gauntlet 3F (S.S Anne)
db 64, ELECTRODE, SANDSLASH_A, MAGNEZONE, GOROTORA, PERRSERKER, SCIZOR, 0 ; The Engineer trainer EXCLUSIVELY uses Magnemites and Voltorbs in normal battles, so I kinda had to improvise with his team a bit...
db 64, ELECTRODE, SANDSLASH_A, ELECTIVIRE, GOROTORA, PERRSERKER, SCIZOR, 0 ; The Engineer trainer EXCLUSIVELY uses Magnemites and Voltorbs in normal battles, so I kinda had to improvise with his team a bit...
; Super Rod encounter showcase, basically
FisherData:
@ -473,7 +473,7 @@ RockerData:
; Route 12
db 29, VOLTORB, ELECTRODE, 0
; Silph Gauntlet 3F (S.S Anne)
db 64, ELECTIVIRE, ELECTRODE, MAGNEZONE, GOLEM_A, GOROCHU, JOLTEON, 0
db 64, GAVILLAIN, ELECTRODE, MAGNEZONE, GOLEM_A, GOROCHU, JOLTEON, 0
; Psychic, Poison, and a little bit of Voltorb.
JugglerData:
@ -547,7 +547,7 @@ ChiefData:
; Poison- and Electric-type Pokemon
ScientistData:
; Silph Gauntlet 4F (Lavender Tower)
db 65, MAGNEZONE, ELECTRODE, PORYGONZ, MIMMEO, WEEZING, ALAKAZAM, 0
db 65, MAGNEZONE, ELECTRODE, PORYGONZ, MIMMEO, GAVILLAIN, WEEZING, 0
; Silph Co. 2F
db 26, GRIMER, WEEZING, KOFFING, WEEZING, 0
db 28, MAGNEMITE, VOLTORB, MAGNETON, 0
@ -745,15 +745,15 @@ JuniorData:
JackData:
; Celadon Mansion Roof House
db 23, MANKEY, PORYGON, HITMONCHAN, SCYTHER, 0 ; Scyther is Kage-Maru.
db 25, MANKEY, PORYGON, HITMONCHAN, SCYTHER, 0 ; Scyther is Kage-Maru.
; Silph Gauntlet 7F (Chief's Office)
; db 70, MIMMEO, ANNIHILAPE, HITMONLEE, PORYGON2, HITMONCHAN, SCIZOR, 0 ; not 100% sure what to do with this guy...
JessieJamesData:
db $FF, 17, MEOWTH, 14, EKANS, 14, KOFFING, 0 ; Mt. Moon
db $FF, 30, MEOWTH, 26, EKANS, 24, LICKITUNG, 26, KOFFING, 0 ; Rocket Hideout
db $FF, 34, MEOWTH, 29, ARBOK, 27, LICKITUNG, 29, WEEZING, 27, VICTREEBEL, 0 ; Pokemon Tower
db $FF, 42, MEOWTH, 37, ARBOK, 35, LICKILICKY, 37, WEEZING, 35, VICTREEBEL, 34, GYARADOS, 0 ; Silph Co.
db $FF, 34, MEOWTH, 30, ARBOK, 27, LICKITUNG, 30, WEEZING, 27, VICTREEBEL, 0 ; Pokemon Tower
db $FF, 42, MEOWTH, 38, ARBOK, 36, LICKILICKY, 38, WEEZING, 36, VICTREEBEL, 35, GYARADOS, 0 ; Silph Co.
db $FF, 80, MEOWTH, 75, ARBOK, 73, LICKILICKY, 75, WEEZING, 73, VICTREEBEL, 71, GYARADOS, 0 ; Citrine Rocket House
INCLUDE "data/trainers/scaled_parties.asm"

68
data/trainers/rival_parties.asm
View file

@ -5,43 +5,43 @@ Green1Data:
db 5, EEVEE, 0
db 5, PIKACHU, 0
; Route 22
db $FF, 9, PIDGEY, 8, SQUIRTLE, 0
db $FF, 9, PIDGEY, 8, BULBASAUR, 0
db $FF, 9, PIDGEY, 8, CHARMANDER, 0
db $FF, 9, SPEAROW, 8, EEVEE, 0
db $FF, 9, SPEAROW, 8, PIKACHU, 0
db $FF, 8, PIDGEY, 9, SQUIRTLE, 0
db $FF, 8, PIDGEY, 9, BULBASAUR, 0
db $FF, 8, PIDGEY, 9, CHARMANDER, 0
db $FF, 8, SPEAROW, 9, EEVEE, 0
db $FF, 8, SPEAROW, 9, PIKACHU, 0
; Cerulean City - char/squirt/bulba are now evolved
db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, WARTORTLE, 0
db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, IVYSAUR, 0
db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, CHARMELEON, 0
db $FF, 18, SPEAROW, 15, RATTATA, 15, SANDSHREW, 17, EEVEE, 0
db $FF, 18, SPEAROW, 15, RATTATA, 15, SANDSHREW, 17, PIKACHU, 0 ; raichu/umbreon before misty is evil
db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 18, WARTORTLE, 0
db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 18, IVYSAUR, 0
db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 18, CHARMELEON, 0
db $FF, 18, SPEAROW, 15, RATTATA, 15, SANDSHREW, 18, EEVEE, 0
db $FF, 18, SPEAROW, 15, RATTATA, 15, SANDSHREW, 18, PIKACHU, 0 ; raichu/umbreon before misty is evil
Green2Data:
; SS Anne 2F
db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, WARTORTLE, 0
db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, IVYSAUR, 0
db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, CHARMELEON, 0
db $FF, 19, SPEAROW, 16, RATICATE, 18, SANDSHREW, 20, EEVEE, 0
db $FF, 19, SPEAROW, 16, RATICATE, 18, SANDSHREW, 20, RAICHU, 0
db $FF, 19, PIDGEOTTO, 18, RATICATE, 18, KADABRA, 21, WARTORTLE, 0
db $FF, 19, PIDGEOTTO, 18, RATICATE, 18, KADABRA, 21, IVYSAUR, 0
db $FF, 19, PIDGEOTTO, 18, RATICATE, 18, KADABRA, 21, CHARMELEON, 0
db $FF, 19, SPEAROW, 18, RATICATE, 18, SANDSHREW, 21, EEVEE, 0
db $FF, 19, SPEAROW, 18, RATICATE, 18, SANDSHREW, 21, PIKACHU, 0
; Pokémon Tower 2F
db $FF, 25, PIDGEOTTO, 23, GROWLITHE, 22, EXEGGCUTE, 20, KADABRA, 25, WARTORTLE, 0
db $FF, 25, PIDGEOTTO, 23, GYARADOS, 22, GROWLITHE, 20, KADABRA, 25, IVYSAUR, 0
db $FF, 25, PIDGEOTTO, 23, EXEGGCUTE, 22, GYARADOS, 20, KADABRA, 25, CHARMELEON, 0
db $FF, 25, FEAROW, 23, VULPIX, 22, MAGNEMITE, 20, SANDSHREW, 25, EEVEE, 0
db $FF, 25, FEAROW, 23, SHELLDER, 22, VULPIX, 20, SANDSHREW, 25, RAICHU, 0
db $FF, 25, PIDGEOTTO, 23, GROWLITHE, 23, EXEGGCUTE, 22, KADABRA, 25, WARTORTLE, 0
db $FF, 25, PIDGEOTTO, 23, GYARADOS, 23, GROWLITHE, 22, KADABRA, 25, IVYSAUR, 0
db $FF, 25, PIDGEOTTO, 23, EXEGGCUTE, 23, GYARADOS, 22, KADABRA, 25, CHARMELEON, 0
db $FF, 25, FEAROW, 23, VULPIX, 23, MAGNEMITE, 22, SANDSHREW, 25, UMBREON, 0
db $FF, 25, FEAROW, 23, SHELLDER, 23, VULPIX, 22, SANDSHREW, 25, RAICHU, 0
; Silph Co. 7F
db $FF, 37, PIDGEOT, 38, GROWLITHE, 35, EXEGGCUTE, 35, ALAKAZAM, 40, TOTARTLE, 0
db $FF, 37, PIDGEOT, 38, GYARADOS, 35, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0
db $FF, 37, PIDGEOT, 38, EXEGGCUTE, 35, GYARADOS, 35, ALAKAZAM, 40, CHARIZARD, 0
db $FF, 38, SANDSLASH, 35, MAGNETON, 37, NINETALES, 35, ALAKAZAM, 40, UMBREON, 0
db $FF, 38, SANDSLASH, 35, NINETALES, 37, CLOYSTER, 35, ALAKAZAM, 40, GOROCHU, 0
db $FF, 37, PIDGEOT, 35, RHYHORN, 36, GROWLITHE, 36, EXEGGCUTE, 35, ALAKAZAM, 40, TOTARTLE, 0
db $FF, 37, PIDGEOT, 35, RHYHORN, 36, GYARADOS, 36, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0
db $FF, 37, PIDGEOT, 35, RHYHORN, 36, EXEGGCUTE, 36, GYARADOS, 35, ALAKAZAM, 40, CHARIZARD, 0
db $FF, 37, SANDSLASH, 35, EXEGGCUTE, 36, MAGNETON, 36, NINETALES, 35, ALAKAZAM, 40, UMBREON, 0
db $FF, 37, SANDSLASH, 35, EXEGGCUTE, 36, NINETALES, 36, SHELLDER, 35, ALAKAZAM, 40, RAICHU, 0
; Route 22
db $FF, 47, PIDGEOT, 45, RHYDON, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, TOTARTLE, 0
db $FF, 47, PIDGEOT, 45, RHYDON, 45, GYARADOS, 47, GROWLITHE, 50, ALAKAZAM, 53, VENUSAUR, 0
db $FF, 47, PIDGEOT, 45, RHYDON, 45, EXEGGCUTE, 47, GYARADOS, 50, ALAKAZAM, 53, CHARIZARD, 0
db $FF, 47, SANDSLASH, 45, EXEGGCUTE, 45, MAGNEZONE, 47, NINETALES, 50, ALAKAZAM, 53, UMBREON, 0
db $FF, 47, SANDSLASH, 45, EXEGGCUTE, 45, NINETALES, 47, CLOYSTER, 50, ALAKAZAM, 53, GOROCHU, 0
db $FF, 48, PIDGEOT, 47, RHYDON, 47, GROWLITHE, 48, EXEGGUTOR, 50, ALAKAZAM, 53, TOTARTLE, 0
db $FF, 48, PIDGEOT, 47, RHYDON, 47, GYARADOS, 48, ARCANINE, 50, ALAKAZAM, 53, VENUSAUR, 0
db $FF, 48, PIDGEOT, 47, RHYDON, 47, EXEGGCUTE, 48, GYARADOS, 50, ALAKAZAM, 53, CHARIZARD, 0
db $FF, 48, SANDSLASH, 47, EXEGGCUTE, 47, MAGNETON, 48, NINETALES, 50, ALAKAZAM, 53, UMBREON, 0
db $FF, 48, SANDSLASH, 47, EXEGGCUTE, 47, NINETALES, 48, CLOYSTER, 50, ALAKAZAM, 53, GOROCHU, 0
Green3Data:
db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYPERIOR, 61, ARCANINE, 63, EXEGGUTOR, 65, TOTARTLE, 0
@ -50,11 +50,11 @@ Green3Data:
db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, NINETALES, 63, MAGNEZONE, 65, UMBREON, 0
db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, CLOYSTER, 63, NINETALES, 65, GOROCHU, 0
; post-game rematch teams, based on FRLG team
db $FF, 77, TRICULES, 78, ALAKAZAM, 77, GAWARHED, 78, ARCANINE, 78, EXEGGUTOR, 80, TOTARTLE, 0
db $FF, 77, TRICULES, 78, ALAKAZAM, 77, GAWARHED, 78, GYARADOS, 78, ARCANINE, 80, VENUSAUR, 0
db $FF, 77, TRICULES, 78, ALAKAZAM, 77, GAWARHED, 78, EXEGGUTOR, 78, GYARADOS, 80, CHARIZARD, 0
db $FF, 77, TRICULES, 78, ALAKAZAM, 77, IGUANARCH, 78, ARCANINE, 78, EXEGGUTOR, 80, TOTARTLE, 0
db $FF, 77, TRICULES, 78, ALAKAZAM, 77, IGUANARCH, 78, GYARADOS, 78, ARCANINE, 80, VENUSAUR, 0
db $FF, 77, TRICULES, 78, ALAKAZAM, 77, IGUANARCH, 78, EXEGGUTOR, 78, GYARADOS, 80, CHARIZARD, 0
db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, NINETALES, 78, MAGNEZONE, 80, UMBREON, 0
db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, CLOYSTER, 78, MAGNEZONE, 80, GOROCHU, 0
db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, CLOYSTER, 78, NINETALES, 80, GOROCHU, 0
ProfOakData:
db $FF, 66, TAUROS, 67, GYARADOS, 68, ARCANINE, 68, EXEGGUTOR, 70, NIDOKING, 70, TOTARTLE, 0

56
data/trainers/scaled_parties.asm
View file

@ -2,7 +2,7 @@
; This goes for Brock's Steelix, Misty's Starmie, Surge's Gorochu, Erika's Bellossom, Koga's Crobat, Sabrina's Alakazam, Blaine's Arcanine, and Giovanni's Rhyperior.
; In addition, for the rematches, all the leaders should have a regional variant (see the LGPE E4 rematches), plus a starter where applicable.
BrockData:
db $FF, 10, GEODUDE, 11, DECILLA, 13, ONIX, 0 ; 0 badges
db $FF, 11, GEODUDE, 12, DECILLA, 14, ONIX, 0 ; 0 badges
db $FF, 19, GEODUDE, 18, KABUTO, 19, DECILLA, 21, ONIX, 0 ; 1
db $FF, 22, GRAVELER, 21, OMANYTE, 21, KABUTO, 23, DECILLA, 24, ONIX, 0 ; 2
db $FF, 29, GRAVELER, 28, OMANYTE, 28, KABUTO, 29, DECILLA, 31, ONIX, 0 ; 3
@ -13,18 +13,18 @@ BrockData:
db $FF, 67, GOLEM, 66, GAWARHED, 66, ARCANINE_H, 67, OMASTAR, 67, KABUTOPS, 70, STEELIX, 0 ; 8 (postgame)
MistyData:
db $FF, 10, HORSEA, 11, STARYU, 13, WEIRDUCK, 0 ; 0 badges
db $FF, 19, HORSEA, 18, GOLDEEN, 19, WEIRDUCK, 21, STARMIE, 0 ; 1
db $FF, 22, HORSEA, 21, CHEEP, 21, GOLDEEN, 23, WEIRDUCK, 25, STARMIE, 0 ; 2
db $FF, 29, HORSEA, 28, JABETTA, 28, GOLDEEN, 29, WEIRDUCK, 31, STARMIE, 0 ; 3
db $FF, 38, SEADRA, 37, JABETTA, 37, SEAKING, 38, GOLDUCK, 40, STARMIE, 0 ; 4
db $FF, 41, SEADRA, 40, JABETTA, 40, SEAKING, 41, GOLDUCK, 43, STARMIE, 0 ; 5
db $FF, 45, KINGDRA, 44, JABETTA, 44, SEAKING, 45, GOLDUCK, 47, STARMIE, 0 ; 6
db $FF, 47, KINGDRA, 46, JABETTA, 46, SEAKING, 48, GOLDUCK, 48, VAPOREON, 50, STARMIE, 0 ; 7 (unused)
db $FF, 11, HORSEA, 12, GOLDEEN, 14, STARMIE, 0 ; 0 badges
db $FF, 19, HORSEA, 18, GOLDEEN, 19, PSYDUCK, 21, STARMIE, 0 ; 1
db $FF, 22, HORSEA, 21, RIBBITO, 21, GOLDEEN, 23, WEIRDUCK, 25, STARMIE, 0 ; 2
db $FF, 29, HORSEA, 28, RIBBITO, 28, GOLDEEN, 29, WEIRDUCK, 31, STARMIE, 0 ; 3
db $FF, 38, SEADRA, 37, CROAKOZUNA, 37, SEAKING, 38, GOLDUCK, 40, STARMIE, 0 ; 4
db $FF, 41, SEADRA, 40, CROAKOZUNA, 40, SEAKING, 41, GOLDUCK, 43, STARMIE, 0 ; 5
db $FF, 45, KINGDRA, 44, CROAKOZUNA, 44, SEAKING, 45, GOLDUCK, 47, STARMIE, 0 ; 6
db $FF, 47, KINGDRA, 46, CROAKOZUNA, 46, SEAKING, 48, GOLDUCK, 48, VAPOREON, 50, STARMIE, 0 ; 7 (unused)
db $FF, 67, KINGDRA, 67, GOLDUCK, 66, TAUROS_PA, 66, VAPOREON, 67, TOTARTLE, 70, STARMIE, 0 ; 8 (postgame)
LtSurgeData:
db $FF, 10, VOLTORB, 11, PIKACHU, 13, GAOTORA, 0 ; 0 badges
db $FF, 11, VOLTORB, 12, PIKACHU, 14, GAOTORA, 0 ; 0 badges
db $FF, 19, VOLTORB, 18, PIKACHU, 19, GAOTORA, 21, ELECTABUZZ, 0 ; 1
db $FF, 22, VOLTORB, 21, GAOTORA, 21, MAGNEMITE, 23, ELECTABUZZ, 25, RAICHU, 0 ; 2
db $FF, 29, ELECTRODE, 28, GAOTORA, 28, MAGNEMITE, 29, ELECTABUZZ, 31, RAICHU, 0 ; 3
@ -35,10 +35,10 @@ LtSurgeData:
db $FF, 67, GOROTORA, 67, MAGNEZONE, 66, GOLEM_A, 67, ELECTIVIRE, 66, JOLTEON, 70, GOROCHU, 0 ; 8 (postgame)
ErikaData:
db $FF, 10, BELLSPROUT, 11, ODDISH, 13, TANGELA, 0 ; 0 badges (unused)
db $FF, 11, BELLSPROUT, 12, ODDISH, 14, TANGELA, 0 ; 0 badges (unused)
db $FF, 19, BELLSPROUT, 18, TOEDSCOOL, 19, ODDISH, 21, TANGELA, 0 ; 1
db $FF, 22, BELLSPROUT, 21, PARAS, 21, TOEDSCOOL, 23, TANGELA, 25, GLOOM, 0 ; 2
db $FF, 29, WEEPINBELL, 28, PARASECT, 28, TOEDSCOOL, 29, TANGELA, 31, BELLOSSOM, 0 ; 3
db $FF, 22, BELLSPROUT, 21, PARAS, 21, TOEDSCOOL, 23, GLOOM, 25, TANGELA, 0 ; 2
db $FF, 29, WEEPINBELL, 28, PARASECT, 28, CACTORMUS, 29, TANGELA, 31, BELLOSSOM, 0 ; 3
db $FF, 38, VICTREEBEL, 37, PARASECT, 37, CACTORMUS, 38, TANGELA, 40, BELLOSSOM, 0 ; 4
db $FF, 41, VICTREEBEL, 40, PARASECT, 40, CACTORMUS, 41, BELLOSSOM, 43, TANGROWTH, 0 ; 5
db $FF, 45, VICTREEBEL, 44, PARASECT, 45, CACTORMUS, 45, BELLOSSOM, 47, TANGROWTH, 0 ; 6
@ -46,18 +46,18 @@ ErikaData:
db $FF, 67, BELLOSSOM, 67, TOEDSCRUEL, 66, ELECTRODE_H, 66, LEAFEON, 67, VENUSAUR, 70, TANGROWTH, 0 ; 8 (postgame)
KogaData:
db $FF, 10, VENONAT, 11, ZUBAT, 13, KOFFING, 0 ; 0 badges (unused)
db $FF, 11, VENONAT, 12, ZUBAT, 14, KOFFING, 0 ; 0 badges (unused)
db $FF, 19, VENONAT, 18, GRIMER, 19, KOFFING, 21, GOLBAT, 0 ; 1
db $FF, 22, VENONAT, 21, TENTACOOL, 21, GRIMER, 23, KOFFING, 25, GOLBAT, 0 ; 2
db $FF, 29, VENOMOTH, 28, TENTACOOL, 28, GRIMER, 29, KOFFING, 31, GOLBAT, 0 ; 3
db $FF, 38, VENOMOTH, 37, TENTACRUEL, 37, MUK, 38, WEEZING, 40, CROBAT, 0 ; 4
db $FF, 41, VENOMOTH, 40, TENTACRUEL, 40, MUK, 41, WEEZING, 43, CROBAT, 0 ; 5
db $FF, 45, VENOMOTH, 44, TENTACRUEL, 44, MUK, 45, WEEZING, 47, CROBAT, 0 ; 6
db $FF, 47, VENOMOTH, 46, NIDOKING, 46, TENTACRUEL, 48, MUK, 48, WEEZING, 50, CROBAT, 0 ; 7 (unused)
db $FF, 47, VENOMOTH, 46, BELLIGNAN, 46, TENTACRUEL, 48, MUK, 48, WEEZING, 50, CROBAT, 0 ; 7 (unused)
db $FF, 67, VENOMOTH, 66, BELLIGNAN, 66, SLOWBRO_G, 67, MUK, 67, WEEZING, 70, CROBAT, 0 ; 8 (postgame)
BlaineData:
db $FF, 10, VULPIX, 11, GROWLITHE, 13, PONYTA, 0 ; 0 badges (unused)
db $FF, 11, VULPIX, 12, GROWLITHE, 14, PONYTA, 0 ; 0 badges (unused)
db $FF, 19, PONYTA, 18, VULPIX, 19, GROWLITHE, 21, MAGMAR, 0 ; 1 (unused)
db $FF, 22, PONYTA, 21, VULPIX, 21, GROWLITHE, 23, CHARMELEON, 25, MAGMAR, 0 ; 2
db $FF, 29, PONYTA, 28, VULPIX, 28, GROWLITHE, 29, CHARMELEON, 31, MAGMAR, 0 ; 3
@ -68,21 +68,21 @@ BlaineData:
db $FF, 67, RAPIDASH, 67, ARCANINE, 66, TAUROS_PB, 66, FLAREON, 67, CHARIZARD, 70, MAGMORTAR, 0 ; 8 (postgame)
SabrinaData:
db $FF, 10, SLOWPOKE, 11, DROWZEE, 13, KADABRA, 0 ; 0 badges (unused)
db $FF, 11, SLOWPOKE, 12, DROWZEE, 14, KADABRA, 0 ; 0 badges (unused)
db $FF, 19, SLOWPOKE, 18, DROWZEE, 19, KADABRA, 21, MR_MIME, 0 ; 1
db $FF, 22, SLOWPOKE, 21, DROWZEE, 21, EXEGGCUTE, 23, KADABRA, 25, MR_MIME, 0 ; 2
db $FF, 29, SLOWPOKE, 28, MR_MIME, 28, EXEGGCUTE, 29, HYPNO, 31, ALAKAZAM, 0 ; 3
db $FF, 38, ESPEON, 37, MR_MIME, 37, SLOWKING, 38, HYPNO, 40, ALAKAZAM, 0 ; 4
db $FF, 41, ESPEON, 40, MR_MIME, 40, SLOWKING, 41, HYPNO, 43, ALAKAZAM, 0 ; 5
db $FF, 45, ESPEON, 44, MR_RIME, 44, SLOWKING, 45, HYPNO, 47, ALAKAZAM, 0 ; 6
db $FF, 47, ESPEON, 46, MR_RIME, 46, SLOWKING, 48, EXEGGUTOR, 48, HYPNO, 50, ALAKAZAM, 0 ; 7 (unused)
db $FF, 45, ESPEON, 44, MR_MIME, 44, SLOWKING, 45, HYPNO, 47, ALAKAZAM, 0 ; 6
db $FF, 47, ESPEON, 46, MR_MIME, 46, SLOWKING, 48, EXEGGUTOR, 48, HYPNO, 50, ALAKAZAM, 0 ; 7 (unused)
db $FF, 67, EXEGGUTOR, 67, SLOWKING, 66, RAPIDASH_G, 67, HYPNO, 66, ESPEON, 70, ALAKAZAM, 0 ; 8 (postgame)
GiovanniData: ; is not scaled as he is always fought last
; Rocket Hideout B4F
db $FF, 30, BEEDRILL, 32, RHYHORN, 32, KANGASKHAN, 34, PERSIAN, 0
db $FF, 28, BEEDRILL, 30, RHYHORN, 30, KANGASKHAN, 32, PERSIAN, 0
; Silph Co. 11F - did you know this team was weaker than the rival in vanilla level-wise?
db $FF, 40, BEEDRILL, 40, RHYDON, 40, KANGASKHAN, 41, NIDOKING, 41, NIDOQUEEN, 43, PERSIAN, 0
db $FF, 38, BEEDRILL, 39, RHYDON, 38, KANGASKHAN, 40, NIDOKING, 40, NIDOQUEEN, 42, PERSIAN, 0
; Viridian Gym
db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, GUARDIA, 48, NIDOQUEEN, 48, NIDOKING, 50, RHYPERIOR, 0
@ -92,9 +92,9 @@ LoreleiData:
db $FF, 68, JYNX, 67, CLOYSTER, 67, NINETALES_A, 69, MR_RIME, 69, GLACEON, 71, LAPRAS, 0
BrunoData:
db $FF, 55, HITMONCHAN, 54, STEELIX, 54, SIRFETCHD, 56, HITMONLEE, 56, TRICULES, 58, MACHAMP, 0
db $FF, 55, JABETTA, 54, STEELIX, 54, SIRFETCHD, 56, HITMONCHAN, 56, HITMONLEE, 58, MACHAMP, 0
; post-game rematch team (currently unused)
db $FF, 70, HITMONTOP, 69, STEELIX, 69, SIRFETCHD, 71, POLIWRATH, 71, TRICULES, 73, MACHAMP, 0
db $FF, 70, JABETTA, 69, STEELIX, 69, SIRFETCHD, 71, HITMONTOP, 71, TRICULES, 73, MACHAMP, 0
AgathaData:
db $FF, 57, ANNIHILAPE, 56, CROBAT, 56, MAROWAK_A, 58, ARBOK, 58, UMBREON, 60, GENGAR, 0
@ -107,8 +107,8 @@ LanceData:
db $FF, 74, GAVILLAIN, 73, GYARADOS, 73, EXEGGUTOR_A, 75, IGUANARCH, 75, KINGDRA, 77, DRAGONITE, 0
YujirouData: ; was unused juggler
db $FF, 4, COINPUR, 5, RATTATA, 8, LICKITUNG, 0 ; 0
db $FF, 10, COINPUR, 11, RATTATA, 13, LICKITUNG, 0 ; 1
db $FF, 5, COINPUR, 6, RATTATA, 8, LICKITUNG, 0 ; 0
db $FF, 11, COINPUR, 12, RATTATA, 14, LICKITUNG, 0 ; 1
db $FF, 19, MEOWTH, 18, RATICATE, 19, FARFETCHD, 21, LICKITUNG, 0 ; 2
db $FF, 22, MEOWTH, 21, RATICATE, 21, FARFETCHD, 23, JIGGLYPUFF, 25, LICKITUNG, 0 ; 3
db $FF, 29, PERSIAN, 28, RATICATE, 28, LUXWAN, 29, JIGGLYPUFF, 31, LICKITUNG, 0 ; 4
@ -117,11 +117,11 @@ YujirouData: ; was unused juggler
db $FF, 45, PERSIAN, 44, TAUROS, 44, LUXWAN, 45, CHANSEY, 47, LICKILICKY, 0 ; 7
db $FF, 47, PERSIAN, 46, TAUROS, 46, LUXWAN, 48, BLISSEY, 48, SNORLAX, 50, LICKILICKY, 0 ; 8
; post-game rematch team
db $FF, 66, PERSIAN, 67, TAUROS, 67, LUXWAN, 66, BLISSEY, 67, SNORLAX, 70, LICKILICKY, 0
db $FF, 66, PERSIAN, 65, TAUROS, 66, LUXWAN, 65, BLISSEY, 66, SNORLAX, 69, LICKILICKY, 0
BlackbeltData:
; Koichi parties
db 12, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 0 badges (unused)
db 13, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 0 badges (unused)
db $FF, 17, MACHOP, 20, HITMONLEE, 20, HITMONCHAN, 20, HITMONTOP, 0 ; 1
db $FF, 20, MACHOP, 20, MANKEY, 24, HITMONLEE, 24, HITMONCHAN, 24, HITMONTOP, 0 ; 2
db $FF, 27, MACHOKE, 27, MANKEY, 30, HITMONLEE, 30, HITMONCHAN, 30, HITMONTOP, 0 ; 3
@ -130,7 +130,7 @@ BlackbeltData:
db $FF, 43, MACHAMP, 43, ANNIHILAPE, 46, HITMONLEE, 46, HITMONCHAN, 46, HITMONTOP, 0 ; 6
db $FF, 46, MACHAMP, 46, CARAPTHOR, 46, ANNIHILAPE, 49, HITMONLEE, 49, HITMONCHAN, 49, HITMONTOP, 0 ; 7
db $FF, 52, MACHAMP, 52, CARAPTHOR, 52, ANNIHILAPE, 55, HITMONLEE, 55, HITMONCHAN, 55, HITMONTOP, 0 ; 8
db $FF, 67, MACHAMP, 67, TAUROS_P, 67, ANNIHILAPE, 70, HITMONLEE, 70, HITMONCHAN, 70, HITMONTOP, 0 ; Postgame
db $FF, 66, MACHAMP, 66, ANNIHILAPE, 66, TAUROS_P, 70, HITMONLEE, 70, HITMONCHAN, 70, HITMONTOP, 0 ; Postgame
; Fighting Dojo Trainers
db 31, CHEEP, CHEEP, JABETTA, 0
db 32, MACHOKE, MACHAMP, 0

2
data/wild/maps/Route14.asm
View file

@ -6,7 +6,7 @@ Route14WildMons:
db 25, DITTO
db 22, ODDISH
db 28, BELLSPROUT
db 26, RAMOOSE
db 28, VENONAT
db 30, VENOMOTH
db 28, GAOTORA
db 30, GAOTORA

6
data/wild/maps/Route15.asm
View file

@ -6,10 +6,10 @@ Route15WildMons:
db 25, DITTO
db 22, BELLSPROUT
db 28, ODDISH
db 26, RAMOOSE
db 26, GAOTORA
db 30, VENOMOTH
db 28, GAOTORA
db 30, FEAROW
db 28, TANGELA
db 30, TANGELA
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

4
data/wild/maps/Route17.asm
View file

@ -3,11 +3,11 @@ Route17WildMons:
db 25, FEAROW
db 27, KOFFING
db 25, RATICATE
db 24, KOLTA
db 26, PONYTA
db 27, GRIMER
db 26, DODUO
db 28, DODUO
db 29, PONYTA
db 29, RAMOOSE
db 28, PONYTA
db 27, DODRIO
end_grass_wildmons

2
data/wild/maps/Route18.asm
View file

@ -7,7 +7,7 @@ Route18WildMons:
db 25, GRIMER
db 26, DODUO
db 28, DODUO
db 29, RATICATE
db 29, TANGELA
db 27, GAOTORA
db 29, GAOTORA
end_grass_wildmons

2
data/wild/maps/Route22.asm
View file

@ -2,7 +2,7 @@ Route22WildMons:
def_grass_wildmons 25 ; encounter rate
db 3, RATTATA
db 4, NIDORAN_M
db 3, NIDORAN_F
db 4, NIDORAN_F
db 4, RATTATA
db 3, MANKEY
db 3, SPEAROW

4
data/wild/maps/ViridianForest.asm
View file

@ -4,11 +4,11 @@ ViridianForestWildMons:
db 4, WEEDLE
db 4, PIDGEY
db 5, CATERPIE
db 4, GENTLARVA
db 5, GENTLARVA
db 5, WEEDLE
db 7, KAKUNA
db 7, METAPOD
db 3, KOTORA ; A replacement for the early starter Pikachu. I think this is an amazing compromise that helps actualise Kotora's "mascot status" when it comes to prototype Pokemon.
db 5, KOTORA ; A replacement for the early starter Pikachu. I think this is an amazing compromise that helps actualise Kotora's "mascot status" when it comes to prototype Pokemon.
db 9, PIDGEOTTO
end_grass_wildmons

BIN
gfx/pokemon/front/blissey.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 881 B

After

Width:  |  Height:  |  Size: 922 B

BIN
gfx/pokemon/front/jynx.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 569 B

After

Width:  |  Height:  |  Size: 920 B

BIN
gfx/pokemon/front/magmortar.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1,005 B

After

Width:  |  Height:  |  Size: 1 KiB

BIN
gfx/pokemon/front/rhyperior.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 831 B

After

Width:  |  Height:  |  Size: 1 KiB

2
scripts/Daycare.asm
View file

@ -311,7 +311,7 @@ DaycareMelanie:
and a
jr nz, .refused ; imagine refusing a bulbasaur tbh
call SaveScreenTilesToBuffer1 ; prevents nickname screen corruption
lb bc, BULBASAUR, 12 ; load the bulbasaur
lb bc, BULBASAUR, 14 ; load the bulbasaur
call GivePokemon ; attempt to give the bulbasaur
jr nc, .fullParty ; if it's fucked just go here
ld a, HS_DAYCARE_BULBASAUR ; hide the bulbasaur

2
scripts/RockTunnelPokecenter.asm
View file

@ -46,7 +46,7 @@ DittoSalesmanText:
ld hl, .NoMoneyText
jr .printText
.enoughMoney
lb bc, DITTO, 23
lb bc, DITTO, 20
call GivePokemon
jr nc, .done
xor a

2
scripts/Route24.asm
View file

@ -298,7 +298,7 @@ Route24Damian:
call GetMonName
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
lb bc, CHARMANDER, 14
lb bc, CHARMANDER, 12
call GivePokemon
jp nc, .fullParty
ld a, [wAddedToParty]