diff --git a/README.md b/README.md index 2a8ab3d6..7ff1b282 100644 --- a/README.md +++ b/README.md @@ -368,7 +368,8 @@ If you use our implementations of anything at all, it is encouraged to submit Pu * Ema Skye - Developer, Maps (Silph Co. and Pokemon Tower shortening), Mt. Moon Crater Guard, Showdown Mod assistance. * BlueZangoose / Vimescarrot - Pokemon box expansion, Instatext option, general assistance. * Albatross - Many of the new sprites used in the hack (A significant number of post-Gen 1 evolutions, all regional variants, Meltan and Carapthor lines, etc.) -* LuciShrimp - Mewtwo & FireRed/LeafGreen Legendary custom battle music +* LuciShrimp - Mewtwo & FireRed/LeafGreen Legendary custom battle music; Area Zero map theme for Mt. Moon Crater. +* jojobear13 & Mateo - DV/StatExp display, move deleter, & move relearner functionality from Shin Pokered, followed [this guide](https://github.com/jojobear13/shinpokered/blob/master/how%20to%20guides/how%20to%20add%20the%20move%20relearner%26deleter.txt). Tweaks were made to make it compatible with the pokered version we worked off of. Thanks specifically to Mateo's Red++ for the ferry system! Jojobear also provided bug fixes! * thornAvery - Various bug fixes, notably to text speed errors. * pret et al - Pokémon Red and Blue Disassembly Project, many tutorials helped us! * ausma - Showdown Mod assistance @@ -385,7 +386,6 @@ If you use our implementations of anything at all, it is encouraged to submit Pu * Helix Chamber, RacieBeep, loumilouminosus, Orchid, GBCRetro, & catstorm26 - Prototype Pokémon sprites. Precise credits are available [here](https://cdn.discordapp.com/attachments/1014321591657709569/1015347305483878521/unknown.png). * Vortiene/Vortyne - Reused a bit of code from their pureRGB hack, including their Trainer AI. Assisted in bug fixes. Used their sprite sheet generator. * Pigu-A, RevoSucks, walle303 - Contributors to Pokemon Anniversary Red's repository, where we reused the Green/FemC sprites and the Battle Tent. -* jojobear13 & Mateo - DV/StatExp display, move deleter, & move relearner functionality from Shin Pokered, followed [this guide](https://github.com/jojobear13/shinpokered/blob/master/how%20to%20guides/how%20to%20add%20the%20move%20relearner%26deleter.txt). Tweaks were made to make it compatible with the pokered version we worked off of. Thanks specifically to Mateo's Red++ for the ferry system! * Rangi - Reused a bit of code from their Red* / Blue* hack to make HMs usable in the overworld, and generally being an amazing individual. * BGVC - Composed the original 4-channel version of the unused Koukan (trading) music. * SatoMew - Technical advice. diff --git a/data/pokemon/base_stats/cheep.asm b/data/pokemon/base_stats/cheep.asm index 7772833e..55c9b93b 100644 --- a/data/pokemon/base_stats/cheep.asm +++ b/data/pokemon/base_stats/cheep.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/cheep.pic", 0, 1 ; sprite dimensions dw CheepPicFront, CheepPicBack - db BUBBLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db BUBBLE, PECK, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/jabetta.asm b/data/pokemon/base_stats/jabetta.asm index e89e89d2..15f42ff9 100644 --- a/data/pokemon/base_stats/jabetta.asm +++ b/data/pokemon/base_stats/jabetta.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/jabetta.pic", 0, 1 ; sprite dimensions dw JabettaPicFront, JabettaPicBack - db BUBBLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db BUBBLE, PECK, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 7ac5db30..9d69767e 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -1216,7 +1216,8 @@ CheepEvosMoves: db 34, SEISMIC_TOSS db 36, WATERFALL db 40, HI_JUMP_KICK - db 48, HYDRO_PUMP + db 44, HYDRO_PUMP + db 48, DRILL_PECK db 0 JabettaEvosMoves: @@ -1227,10 +1228,10 @@ JabettaEvosMoves: db 21, BUBBLEBEAM db 25, LOW_KICK db 30, JUMP_KICK - db 34, SEISMIC_TOSS - db 36, WATERFALL - db 40, HI_JUMP_KICK - db 48, HYDRO_PUMP + db 36, SEISMIC_TOSS + db 38, WATERFALL + db 46, HI_JUMP_KICK + db 52, DRILL_PECK db 0 VulpiiiEvosMoves: