Commit graph

68 commits

Author SHA1 Message Date
Martha Schilling c93beb4d72 Improving movesets! (Improvesets?)
- Rhyhorn's evolution line get moves at earlier levels, and now learns Rock Slide and Earthquake by level up.

- Clefairy gets Body Slam by level up.

- Nidoking and Nidoqueen get Earthquake by level up. Nidoreign instead gets Rock Slide and Body Slam.

- Grimer and Muk get moves at earlier levels, and also Acid and Haze (from Smujj)

- Scyther gets Wing Attack much earlier. Scizor keeps Double Team as a level up move, instead getting Iron Head at Level 1.

- Tangela and Tangrowth get moves at earlier levels, and also Night Shade (from Burgela)

- Geodude's evolution line now get Rock Slide by level up.

- Paras and Parasect get Absorb (from Paraspor).

- Psyduck learns Tail Whip earlier.

- Magnemite's evolution line get moves at earlier levels.

- Koffing and Weezing get moves at earlier levels.

- Seel and Dewgong get moves at earlier levels, and also Powder Snow.

- All Tauros forms get a new move by level up (Body Slam, Low Kick, Flamethrower and Water Gun respectively) and learn Tail Whip much earlier.

- Trampel gets moves at earlier levels, plus Body Slam and Earthquake as level up moves.

- Gavillain gets ThunderShock, with a few moves pushed back to later levels.

- Sharpoon gets moves at earlier levels, plus Smart Strike.

- Bittybat's evolution line get moves at earlier levels, and Golbat evolves into Crobat slightly earlier.

- Doduo's evolution line get moves at earlier levels, plus Quick Attack (from Dodaerie)

- Jynx gets Powder Snow as a level up move.

- Meowth, Persian and Perrserker get moves at earlier levels.

- Vulpiii's evolution line get moves at earlier levels.

- Ribbito and Croakozuna get moves at earlier levels.

- Omanyte, Omastar, Kabuto, Kabutops  and Aerodactyl all learn Rock Throw by level up.

- Seadra gets Pin Missile.

- Ministare and Iguanarch get moves at later levels, and Ministare evolves slightly later to match Dragonair.

- Sandshrew and Kantonian Sandslash get Earthquake by level up.

- All 3 cocoon Pokemon their pre-evolution's moves as Level 1 moves, and try to learn Harden each level before evolving again.

- Beedrill gets Fury Attack slightly earlier.

- Pendraken gets moves at earlier levels.

- Weirduck gets moves at earlier levels, and evolves into Golduck slightly earlier to match vanilla.

- Golduck also gets moves at earlier levels.

- Guardia gets a few moves it was missing from prior evolutions.

- Orfry gets Fury Attack slightly later, but both Goldeen and Seaking get moves at earlier levels. Seaking also gets Swords Dance by level up.

- Ponyta and Rapidash get moves at earlier levels.

- Bellignan gets a few moves it was missing from prior evolutions.

- Hitmontop learns Focus Energy earlier.

- Wugtrio gets moves at later levels to match Dugtrio.

- Sirfetch'd learns Leer and Double Kick later, but all other moves earlier.

- Melmetal no longer gets Smart Strike.

- Alolan Dugtrio gets Sand-Attack and a slight moveset shuffle.

- Alolan Golem gets Defense Curl, Rock Slide by level up, and a slight moveset shuffle.

- Galarian Slowbro and Slowking learn moves at later levels, with Slowbro getting Withdraw and Sludge.

- Various evolved Pokemon getting L1 moveset additions to remain consistent.
2023-12-07 23:10:42 +00:00
Martha Schilling 0fc225bbe8 Update credits.asm
oops, missed a few notes
2023-11-29 23:43:15 +00:00
Martha Schilling 02e6aa7bb0 Updating the credits
Added a few more names from the README into the in-game credits, and used the original draft of the ending theme to extend the music.
2023-11-29 23:09:20 +00:00
Martha Schilling ef62d0a43f would you believe me if i told you this still isnt done
in the middle of a breakdown here but i'm committing this because I don't wanna have an overwhelming number of changed files like the Big One

- Fixed a bug where an item couldn't be picked up in Mt. Moon Crater

- Gave new cries to Leafeon, Glaceon, Perrserker, Gentlarva, Carapthor, Gorotora, Magnezone, Tangrowth, Tricules, Magmortar and Meltan. Pupal and Lickilicky also got new cries but they'll probably be changed later

- Changed Citrine's map slightly for hopefully the final time, removing the tall grass to allow the Old Man Glitch to work there

- Brought Pokemon Tower 5F back for some reason

- Moved the Rocket Grunt on Silph 11F closer to the Omegadge door

- 'Fixed' a warp issue on Faraway Island, can definitely be improved though

- Gave Gapdos 10 more base special because i forgot the first time

- Fixed a typo in Hitmontop's dex entry

- Fixed some inconsistencies in Gao and Gorotora's movesets

- Added the unused ice tiles to Seafoam Islands and Garnet Cavern (credit to Vortiene)

- Added a stats page to the Pokedex that displays base stats and the type of caught Pokemon (again, credit to Vortiene)

- Made Sandshrew more common in Mt. Moon

- Improved the 'already caught' icon

- uncapitalised all new instances of "trainer" in the text to make it more consistent

- HOPEFULLY fixed the issue where the SS Anne still couldn't be reboarded
2023-11-20 11:00:20 +00:00
Martha Schilling 5bb500d044 Rejoice! Bittybat is back!
(oh and also Magnetite too i guess)

- Finally updated Oak's Pokedex rating checks to accommodate the higher number of Pokemon.

- Albatross strikes again, bringing updated sprites for Alolan Ninetales and Exeggutor, plus Aqua and Blaze Breed Paldean Tauros! Combat Breed is still the same.

Please note that the game is still unfinished, I'm hoping I can have the proper time and motivation to knock out the last few bugs and unimplemented features. Doing my best, okay? :3
~ MM
2023-11-08 17:25:44 +00:00
Martha Schilling 9c35a2c12c oh my god why did i forget to push this
- 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.
2023-11-03 13:20:31 +00:00
Llinos Evans 953e8e295f Post-stream bits and bobs
- Reused the double doors for the Route 2 gate, and added the warp for it
- Changed the Route 2 map to have the ledge on the path this irritated the fucking LIFE out of me
- Pokemon Tower takes you to the right place when going down.
- Kotora line now has Flash
- Refactored Gentlarva
- Route 2 gate now uses the double doors.
- New hidden Moon Stone where the Clefairy are in Mt. Moon
- Added a new Paradox Pokemon-themed border by Gecko557
- Shifted a ledge in Cerulean City that was off-centre in a really jarring way
- Added the Nugget glitch from FRLG because it's funny and cool
2023-09-20 08:17:34 +01:00
Martha Schilling 508a4e790e The Big One.
Whoa, this one's been in the making for a while now. This one has been my attempt to fix as much as I could within a little over a month. Here's what I've got for you.

- Fixed a bug in Silph Gauntlet where the trainers would not see you unless you spoke to them

- Removed the unnecessary Gawarhed and Wugtrio static encounters. In what was once Gawarhed's place is a Rare Candy.

- Implemented a working ferry system (huge thanks to Red++) that allows travelling to Faraway Island and Citrine City with the right tickets. Currently both maps use a copy of the SS Anne, which may be revised later.

- Bittybat, Magnetite and Burgela have been removed to fix a Pokedex bug where entries wouldn't display correctly if the total number wasn't a multiple of 8.

- Fixed a bug where fishing up a Wiglett and Wugtrio would play the trainer battle and Champion battle themes respectively

- Restructured the Pokedex a little. Don't worry, Lickitung's still number 108!

- All references to betamon in the disassembly have had their names updated to match the new Ogasawara ones

- Removed Blastyke as a Game Corner prize, replacing it with Squeamata.

- Garnet Cavern is now properly listed as a dungeon map

- Fixed an issue where trying to leave Bill's House after entering the garden would put you back in the garden

- Moved Silph Gauntlet's Beauty down 1 floor to make the number of trainers on each floor more consistent

- Finished Gauntlet 6F except for the trainer text (PvK please help)

- Gavillain's stats updated to match KEP 1.4 on the Showdown server. It's now a Dragon/Electric type with less Ice coverage.

- Fixed Clefable's and Wigglytuff's starting movesets from an earlier commit

- Fixed an ABSOLUTELY HORRIBLE, EGREGIOUSLY FRUSTRATING BUG that caused the Pokedex's seen counter to rarely update. This is what caused this commit to be delayed for so long. No joke.

- New sprites, courtesy of Albatross, for Sylveon's back sprite, Alolan Marowak, Alolan Muk, Galarian Weezing and Magnezone!

- Fixed a bug preventing the trade for Haunter from being accessed.
2023-09-19 23:34:25 +01:00
Llinos Evans f6cdf8d428 Legendary Theme Demake
It's done! This took a lot of work on LuciShrimp's end, mainly due to CrystalTracker issues.

This fixes the synchronisation issues seen in the previous iteration, dramatically improves the loop point, and has various other shifts to make it much easier on the ears.

I'm glad we chose to use the Mew version of the theme from Emerald, it feels much more complete!
2023-08-22 15:46:22 +01:00
Martha Schilling ecb6988ba5 August bug fixes: Part 1
Credit to ViWalls for discovering most of these bugs in his playtest:

- Citrine City's theme has been made slightly louder.

- The book in Mr. Fuji's house had difficulties working properly, so it's been removed for now.

- Fixed issues where Silph Co. and the Fishing Rod house displayed incorrectly on the Town Map.

- Removed the unnecessary sign outside Celadon University.

- Fixed an issue where 2 NPCs in Cinnabar Lab and Pokemon Mansion, respectively, had incorrect text.

- Fixed a text issue in Pokemon Mansion where the final Mewtwo log would display incorrectly.

- Altered a piece of text in the secret area of Pokemon Mansion to avoid a text box error since the idea we had in mind for it was scrapped.

- Fixed a text issue in Viridian Pre-Gym where the text for the right-side poster overflowed past the edge of the textbox.
2023-08-03 16:39:11 +01:00
Martha Schilling 38b2b2c6c9 Updated Citrine theme, plus some text changes
Pushing a commit for the less important stuff while I finish the Silph Gauntlet's missing floors.

- Swaps the Biker and Psychic in Silph Gauntlet around

- Increased J&J's Meowth's level to make it less unbalanced in the later fights

- Text improvements for Citrine City, Saffron Gym, and Viridian PokeMart
2023-07-28 11:03:11 +01:00
Llinos Evans 5cf0a7930e Wild data refinements
Some of the wild data on these routes needs to be looked at long and hard. Many of them have an extreme amount of variance that ends up making it harder for players to find what they actually want - note that in these games, it does take a while to get through a single one. In general, reduce the variance. Some areas feel a bit chaotic as well, I noticed Barunda in a few places that felt off.

Victory Road has been refined, with the Hitmon repeats made more accurate to LGPE - they are encountered individually on different floors. I have upgraded much of the area's residents, such as adding Rhydon from FRLG and turning Onix, Graveler, and Marowak into Trampel, Crocky, and Guardia. Steelix is a worthy consideration. I've kept Machoke and Golbat to serve as "blanks" to KO for exp on weaker Pokemon the player may have. It could still be refined, but this is a step in the right direction.

I've decided to put Kotora in the "Pikachu slot" in Viridian Forest as a compromise for the lack of an early Electric-type when Pikachu isn't chosen. It's at Level 3, so it will take longer to train by comparison - thus, by this point, it cannot compete with the starter Pikachu, as that will be around Level 10-12.
2023-07-25 09:23:06 +01:00
Llinos Evans 77261d1dd6 Tweaks
Legendary theme hadn't received the proper rename, that's fixed. Also, this theme now plays for Snorlax and the Power Plant Voltorb/Electrode, just like LGPE.
2023-07-23 21:24:32 +01:00
Llinos Evans 08b976a08b FRLG Legendary Battle theme
LuciShrimp strikes again! A demake of the Legendary Battle theme from FireRed/LeafGreen.

This theme is set to change down the line, possibly taking elements from the Emerald theme Mew uses to differentiate itself more. Mainly committing as the infrastructure has been put in place.
2023-07-23 21:06:28 +01:00
Llinos Evans 8cd8f1ded0 Shinjuku Jack, final Mewtwo theme
This renovates the Celadon Mansion Roof House to feature a faithful restoration of Shinjuku Jack. Notes are in the script file.

Also, LuciShrimp's Mewtwo theme is finished!
2023-07-16 17:14:43 +01:00
Martha Schilling 21b3f0f5a7 More bug fixes!
- The Zapdos in Brunswick Glade now vanish correctly, due to fixing a desync in the hide/show data

- Brunswick Glade's palette displays correctly

- Improved Citrine City's theme a little

- Changed palettes for Cryithan's line to reflect their upcoming redesign

- Updated Cryithan's sprite
2023-07-15 00:07:05 +01:00
Martha Schilling 85e1701879 okay this should be okay now
clearly I messed up somewhere
2023-07-11 00:40:58 +01:00
Martha Schilling f6efd42dd8 Revert "Initial Citrine City music"
This reverts commit ea3727e5b5.
2023-07-11 00:38:55 +01:00
Martha Schilling 5c18ca9f75 Initial Citrine City music
- Citrine City uses its own music track, being a revamped version of the unused trading music that was thought to be a town theme for several years. Could still use some work though.

- Improved Crocky's sprite a little, giving it the proper dimensions and improving the hairstyle a tiny bit

- Fixed an issue with Sylveon's Level 1 learnet
2023-07-11 00:38:22 +01:00
Llinos Evans 41e7439496 Fix Mewtwo theme play issues
Mewtwo's theme wasn't playing properly because I am silly and forgot to add a `jr .playSong` so it doesn't fall through. Also, it needed to be before the wild check. Now it works as expected.

This also has the latest version of the Mewtwo theme by LuciShrimp, which is reaching a pretty amazing state.
2023-06-25 20:09:52 +01:00
Llinos Evans c445892d7f S.S. Anne healer and other bits
This adds the S.S. Anne healer from FRLG that's notorious for gaslighting newer players who just think she's there.

This also adds an extremely early Mewtwo theme. It's far from finished, just happens to be in this commit as I was testing it in debug - thanks to Luci for working on this!

Updated bug list as well with things my friend Crunter found.
2023-06-21 21:06:08 +01:00
Llinos Evans 86230c64f1 New Citrine map architecture, Kinchou01
This adds all the required architecture for the new maps to work, as well as Kinchou01 to play when in Celeste Hill itself.

This doesn't add the events, though.
2023-06-14 22:49:03 +01:00
Martha Schilling 0e57ed01ce
Update victory4.asm
Removes the fanfare at the start to make it usable as a map theme. Seems to be identical to GSC's Mt. Moon Square but I could be wrong...
2023-05-17 15:59:33 +01:00
Llinos Evans 082e581d81 Mt Moon Square, Jessie & James Backport
This adds Victory4 in its original form over Mt. Moon Square's music, which could possibly have the initial jingle removed. I noticed the GSC version was being used, which wasn't ideal.

Mt. Moon Square's map is added, with accessibility where the Crater's originally was (for now). One warp on the south part of the map doesn't go anywhere (actually it's a glitch city). The shop and Clefairy event aren't done yet.

The Mt. Moon Crater Guard has been removed with the pretence of re-adding him on the Square map once it's finished.

I'm trying out having the text in the raw script file without farcalling, which seems to be more optimal than doing it the way the devs originally did it. The Battle Tent does this too.
2023-05-15 19:26:42 +01:00
Llinos Evans 16e3c69ee8 Giovanni uses his unused theme, and more!
This update does a good few things. Giovanni now uses his unused encounter theme in all pre-fights, which is followed by the regular evil trainer theme when you're about to fight him. This feels very correct. His team has also been minorly altered.

I backported LGPE's pre-fight monologue for Giovanni in Rocket Hideout B4F. Adapted for RB's story, of course, no Cubones here. The original text is very awkward and abrupt, and it also makes the encounter theme feel much more effective in delivery. I think a lot of people can appreciate this.

I also backported Jessie and James for Rocket Hideout B4F while I was at it. I had to change their event script quite a bit for it to fit, and their walking seems...awkward. Regardless, it's functional. The rest will be done with time.

To make future dev door testing easier, I'm keeping all warps I've previously used in comments.
2023-05-05 04:48:58 +01:00
Llinos Evans 760121d8fd Adding the last of the used moves
Dark Void and friends aren't in and probably won't be, I dunno yet.

I think Kowtow Cleave is really badass so I gave it to Night Slash too.

Scream Tail and Barunda now have Disarming Voice, which also has its own sound, which is basically Sing but a bit different.

Fake Tears was given its own subanimation to account for the fact it's basically a Water Gun used on yourself.

The FIGHT debug function helps a lot with this whole thing, so test with that.
2023-04-29 21:00:17 +01:00
MementoMartha 14626866b6 Mt Moon Crater fixes
Now has new music (the Mt. Moon Square theme from GSC, which was originally planned as a victory theme in Gen 1), as well as functioning wild encounters and items.
2023-04-25 23:15:02 +01:00
MementoMartha 6a693a931b Field06 fixed!
Also added a new palette for Brunswick, just trying to figure out a way to display it (possibly because Brunswick isn't listed as a Route map?)
2023-04-25 01:20:59 +01:00
MementoMartha eba8947133 Very minor fixes
Fixes a few small text issues, updates the readme, and rebalances the fishing rod Pokemon. Also shifted Blottle to earlier in the Pokedex, cause I felt like it.
2023-04-23 16:18:02 +01:00
Llinos Evans 78d3ed63f2 Citrine Rocket House
This map is pretty much finished, save for the map sprites for Jessie, James, and the unused Cat (aka Meowth) being imported, as well as an & symbol. This adds everything else - the marts, the Rocket Trio fight, the meeting music, the tileset, the trainer class for Jessie/James, I could go on. A ton of work well-done.
2023-04-22 20:49:19 +01:00
MementoMartha 027d9b4ee5 Kokana, Kasanagi and Carapthor!
A three-stage Bug line that mirrors the Caterpie and Weedle lines, being an old design for Weedle's evolutions. Pudi, Hinaazu and Betobebii have been removed, though.
2023-04-22 12:20:29 +01:00
MementoMartha c8164fcd2d Update cry_headers.asm
New cries for Rhyperior and PoryZ. Took many attempts to make PoryZ's but I feel like it sounds fine now
2023-04-21 11:12:17 +01:00
MementoMartha 707e3ae7a9 Lavenbar Island-Town
This is an attempt to recreate the music in the video below. Still unfinished as the new channel isn't in sync.
(https://www.youtube.com/watch?v=60toSFxt_Jo&t=59s)
2023-04-20 21:28:48 +01:00
MementoMartha b2bab794c7 Updating Taaban's cry 2023-04-20 15:07:22 +01:00
MementoMartha f242ae1356 Update cry_headers.asm
Adding a few more cries and tweaking a few of the already-added ones.
2023-04-20 14:47:44 +01:00
MementoMartha e4380a39a4 Gen 2 cries + Earthtron!
Giving all the gen 2 evolutions their finalized cries (including Tsubomitto's) and also adding the unused 'Earthtron' cry for Gorochu, Crocky and Jagg.
2023-04-20 09:09:46 +01:00
Llinos Evans afc8d3caf0 DIGDA
This adds Digda01 and Field06 to the music repertoire, and has Digda01 be used in Diglett's Cave, as God intended.
2023-04-20 07:02:13 +01:00
dannye 8275f33856 Update cry_headers.asm 2023-04-19 23:32:54 -05:00
dannye e3a3e6dbd6 Fix Drumkit6 2023-03-16 00:00:46 -05:00
dannye 5357fee84f Update TCG2 songs
they actually don't sound half bad now!
2023-01-14 00:09:25 -06:00
dannye 867f70ab1e Update TCG songs 2023-01-13 21:58:00 -06:00
dannye aab4d20881 Update TCG songs 2023-01-13 21:07:04 -06:00
dannye cf42c6ee65 Fix pitch_slide on channel 2 and 3, part 2 2023-01-01 20:33:32 -06:00
dannye 610521f77a Fix pitch_slide on channel 2 and 3
thanks to TempoQuill
2023-01-01 19:54:26 -06:00
dannye fc059d36af Remove the inc_section macro
the idea is nice, but it thwarts make's dependency change detection
2022-12-28 21:25:19 -06:00
dannye 3f691fcb21 Merge branch 'master' of https://github.com/pret/pokered 2022-12-28 17:38:38 -06:00
dannye 4a10ab5b8f Fix tcg2 channel 3 initial volume 2022-12-25 14:14:27 -06:00
dannye 37a2367547 Unroll repts in tcg2 songs 2022-12-25 13:25:51 -06:00
dannye fc07fb1f9b Rename tcg extension macros 2022-12-25 13:19:49 -06:00
dannye 1115a3fe6c Unroll repts in tcg songs 2022-12-25 13:12:32 -06:00