Commit graph

400 commits

Author SHA1 Message Date
May Evans 71de0f07a5 Groundwork for Viridian Pre-Gym
This map is fully functional but has a lot of bits to iron out, as well as a need for Gym Trainers. I'm also not wholly satisfied with Yujirou's team; maybe remove Eevee?

Yes, I designed an entire tileset for this. Fear me. Bow before me. Actually, don't, this was beyond rational thought.

Current issues;
- Yujirou's sprite doesn't work properly.
- Needs Gym Trainers (hell)
- Yujirou needs an event for being beaten, the refight, and more.
2023-03-30 02:12:45 +01:00
May Evans 57d79f43ed Up-Grade NPC
Seems to interact oddly with Saffron but I believe this is because of the way Team Rocket works. The event itself works fine.

Also added the Up-Grade, as before, Porygon was evolving via Trade.

Uses text referencing LGPE, and has a similar location.

Because of the sprite limit in Saffron, the Pidgeot NPC has been removed.
2023-03-29 23:47:26 +01:00
May Evans 9cf8a3fcc7 Fix Celadon University spriteset issue
Thanks to erosunica for the help!

Contains some Citrine City groundwork as well.
2023-03-29 21:25:43 +01:00
May Evans fffcf9a393 Update sprite_sets.asm 2023-03-29 18:29:52 +01:00
May Evans c759efdeea Rework CeladonU Trainers
This refactors the Celadon University trainers to ensure that they process properly without the odd memory leak-y thing I did before. Overall works the same, just works for the intended purpose.

I also applied what I learned to Professor Oak, giving a Yes/No prompt and adding some pre-battle music as I originally intended.
2023-03-29 17:41:45 +01:00
MementoMartha c9b01f2c64 A few minor changes
Reworks the Pokedex to accommodate for the regional forms, changes a title screen graphic, and cleans up a few base stat files (will do the rest later). Also revised a few dex entries (special thanks to my girlfriend for Gyopin's!)
2023-03-29 11:35:41 +01:00
May Evans eb46fbdaf6 Pikachu/Eevee Mode Part 2
Thanks to Frrf for helping me fix the broken code I initially sent in. This commit refines the mode so that the Oak Lab cutscene is finished and the party picking process is all concrete.

Also, given Surge is a fight, the S.S. Anne Pikachu rival can have Raichu, surely...

Also, the UnusedNames files were, in fact, needed...otherwise, the item names get all corrupted. Probably left some code behind.

So we officially have a new funky mode!
2023-03-28 19:07:51 +01:00
May Evans 0226ba9579 Pikachu/Eevee Mode
So some bits of this are untested, but the base starters are unaffected. I had to work a lot with the sprite limits so Oak's lab has been changed a bit.

This adds a Pikachu and Eevee "mode" to the game, allowing you to pick them as starters. When doing so, the Rival will always pick the opposite.

There are some glitches;
- Picking Charmander makes Blue erase himself from existence
- Picking from anywhere other than the front of the table may have odd results.
- Oak has to be shown in the lab at the start from now on for some reason; side effect of removing the dexes, there's definitely a fix for this.
These are from me not finishing the ball picking process - it was a little weird.

Parties based on starters have been updated but I had to cut out a lot of unused trainer slots.

Also the unused names were removed.
2023-03-25 16:02:23 +00:00
May Evans f099436f8d Fix Bill's House
Bill's House is now finished and fully functional, save for the PC. I've left some commented-out code to have the dex entries in case someone wants to do that.

I did some groundwork for a Blastyke starter but it's really difficult and unwieldy, so I've left it out of this commit and likely won't bother. Pikachu and Eevee mode is definitely in the cards though.
2023-03-25 10:43:58 +00:00
May Evans 07350939ad Cry, index, and name framework
Following index order I did in `evos_moves.asm`.
2023-03-09 02:36:50 +00:00
May Evans efe2d446a1 Item Descriptions!
Added using this tutorial:
https://github.com/pret/pokered/wiki/Item-Descriptions
Credit to Rangi for the baseline code!

Updated Candy Sack -> Candy Jar as discussed a while ago too.
2023-03-08 03:27:32 +00:00
May Evans 8f77a53fc1 fuck it just do all the learnsets
Yeah so I got bored and decided I'm just going to do all of these. Commented out for when they're added.

Also added slots for the potential addition of the Galarica Twig and Wreath but this seems so cringe
2023-03-08 02:39:26 +00:00
May Evans 476d0f356b More dex entries, Meltan/Melmetal base stats and dex
This finishes the regional form dex entries and adds Meltan and Melmetal to the framework since they aren't in yet.

The following needs to be done:
- Name entry
- Dex placement
- Cries
- Palettes
- Sprites adjusted for KEP itself (greyscale, 56x56, whitening)
- Sizes
- probably a bit more
2023-03-08 01:32:28 +00:00
May Evans e431387e25 Tauros base stats, some dex entries
Done dex entries up to bong weezing. Many will likely see revisions.
2023-03-07 10:18:33 +00:00
May Evans 243afabb19 Base stat files for regional formes
Done up to Mime G, just needs Tauros breeds and it's done.

Obviously need to do the rest of the stuff that comes with them...
2023-03-06 13:22:36 +00:00
May Evans 52363fc15c Fishing Group 10 for Bill's Garden 2023-03-06 12:27:11 +00:00
May Evans 8f809124d0 Concrete Bill's Garden wild data
This tweaks the wild data so Aerodactyl, Omanyte, and Kabuto are in the water. Also diversified the Squirtles and added slots for the Hisui formes to use once they're in.
2023-03-06 12:23:45 +00:00
May Evans 22236d2072 Add Dubious Disc Salesman
This adds the Dubious Disc Salesman to Cinnabar Pokemon Centre. I chose this area because it's late in the game and it seemed a bit iffy to constantly have to go with Pokemon Centres not in towns. Cinnabar has some connection to Silph, so it makes more sense than just balancing.

There are probably improvements that could be made (eg. a quote as you buy) but the salesman code is surprisingly brittle so I'd rather not break stuff for hours for something that already works perfectly fine.
2023-03-06 05:14:19 +00:00
May Evans bcb67db573 Bill's Garden, add Rowan NPC
Rowan NPC added to Cinnabar Lab, just a little cute thing.

Bill's Garden could see many revisions, what's here is the bare minimum. Here's what's done:
- Nidorino NPC blocks it off and is unlocked in the post-game. This currently contradicts the myth - I have a plan for this soon.
- Wild Pokemon are the "non-reproducibles" given in Stadium; starters and eevee are mandatory given those were common in the myth
- Hisui forms should be added when possible
- I had to remake Martha's map in the forest tileset so leaving would be possible
- Everything is at a point where it functions
2023-03-03 10:41:28 +00:00
May Evans 1d49a84b7e Framework for Regional Trades
This implements much of the stuff Martha wants for the regional forms.
- Alola forms have trades; version exclusives moved to Pewter
- Galar forms will be on the S.S. Anne to promote returning
- Regional form evos will be on the S.S. Anne possibly? Maybe something else.

Also contains a similar-to-LGPE trade quote. Extremely compressed quotes.
2023-02-24 11:42:38 +00:00
May Evans 86f6151a17 A few cool changes
- Pokemon Mansion has a Guard NPC now
- Professor Oak now plays the Champion theme when you fight him.
2023-02-24 00:05:16 +00:00
May Evans a85c26b7d3 LOTS of things
- Replaces the Old Rod with the Candy Sack, an item to evolve Meltan into Melmetal. Meltan and Melmetal aren't in yet.
- Improves Gym Leader and Elite Four AI by a lot. They still use items, they're just better. Fixes XSpecial use while we're at it; before, it didn't actually increase the stat...
- The Scarlet Book now takes up both shelves, one section for each Paradox Pokemon. I also moved the bookshelf so it looks nicer.
- Text in Celadon University has been reduced significantly, taking up less memory and being a bit more RBY-like. It has also been made more accurate (thanks to Daiginjo for translating my booklet!)
- The Magikarp researcher in Celadon University now gives TM Dragon Rage (no longer unused!)
- Added a guard for Mt. Moon Crater.
- Removed TrainerNamePointers, Blank Leader Name Code, and Dakutens/Hakutens using a guide published by YakiNeen.
- PP no longer uses a shitty graphic and is instead properly implemented into the font, optimising the status screen. Also displays in-battle which is kinda cool.
- Lorelei, Bruno, and Agatha now play the Gym Leader theme, not just Lance.

Still unsure how to fix Celadon University's trainers, all I know is a lot of the information should be taken from the Oak fight I did. The code is radically different and doesn't call trainer headers at all. You'll likely want to start from scratch.

The Mt. Moon Crater Guard's text is a little wonky, not sure what's up there. May have been from the way I accessed Mt. Moon in testing. Anyway, if you want to mess around feel free.
2023-02-19 06:25:33 +00:00
MementoMartha a3f3763f4d New sprites, a few bug fixes/tweaks
All of the Ubers have sprites now (goodbye Lion Pory2!), fixed a small bug I made on Route 19 when resizing Cinnabar, and some minor text updates/fixes.
2023-02-08 17:13:44 +00:00
May Evans cef7b12780 add old rod reference
seemed funny in my head, also indirectly references magikarp jump if you look REEEEEEALLY into it
2022-12-24 23:14:45 +00:00
May Evans b903979237 update fighting dojo trainer
he now has sirfetch'd
added giovanni note for when we finish lavender tower
2022-12-24 22:58:42 +00:00
MementoMartha 2fc1f2250b A Christmas miracle! Martha got something done!
(and by that, she added Perrserker, Sirfetch'd, Mr. Rime and the Galar Birds, plus some team scaling and updated sprites for Politoed and Annihilape.)
2022-12-24 22:37:39 +00:00
May Evans 02fe134613 Update parties.asm 2022-12-19 05:56:20 +00:00
May Evans 0a1075f66a Add items to Mt Moon Crater
Adds fossils, Black Augurite, and a few other neat items to Mt. Moon Crater, given it's where the "ancient" Paradox Pokemon are. Seemed cool to me. Also does a few misc things
2022-12-18 05:56:07 +00:00
May Evans 597dc62f2e Give Paradox Pokemon the unused growth rates
It seems incredibly funny in my mind and does help close the in-game gap between them; Scream Tail got the very short end of the stick...
2022-12-18 05:00:15 +00:00
May Evans 5e4fb4af38 Readme facelift, evo condition changes
I gave the readme a facelift to show what's what, and also added notes on the new evolution conditions.

Some notes on evo condition changes;
- Set Sirfetch'd to be a Heart Stone evolution, seems fitting.
- Reverted Pikachu back to stone -> trade, as this is the most consistent with what people will rationally do. People **will** try to trade for Gorochu according to the mythos behind the whole thing, there's really not much wiggle-room.
- Swapped the Vileplume and Bellossom to match SW97 and base Vileplume, it's just confusing to veterans otherwise.

Things to consider:
- Making the Porygons consistent, right now they just aren't. Either add the Up-Grade or make Porygon2 trade as well.
- Adding the Politoed evolution to Poliwag as well to match early material that implied such.
2022-12-17 22:10:45 +00:00
May Evans f4f2628f8d Gym scaling base
This adds gym scaling for every leader, plus Koichi of the Fighting Dojo.

Me and Ema decided to give Koichi scaling, as he is a gym leader in everything but class. I will likely give Yujirou the same treatment once he's all set up.

The parties have not been set up, assuming Martha is working on them.

An important note: space is somewhat limited on trainers now, so the leaders will need implementing incrementally. You will most likely have to remove unnecessary trainers to make this work.
2022-12-17 20:47:39 +00:00
May Evans f582550f55 Add Gym Scaling for Brock
This code has been tested on 8 Badges and loads the rematch team, which implies it works correctly. It needs to be tested with progression and the like, though.

I've also renamed the "Pocket Lapras" a la the "Miraidon's Poke Ball" concept from SV, which can be used later.
2022-12-17 06:41:38 +00:00
MementoMartha 4dc561d0b5 CooltrainerF! 2022-12-14 20:11:29 +00:00
May Evans 51f694699f change oak team levels and cooltrainerm gauntlet 2022-12-14 20:08:48 +00:00
May Evans 99fa5a27b9 Fix Mt. Moon Crater and Oak team choices 2022-12-14 20:03:55 +00:00
MementoMartha d883c40fff New sprites and a warp to the crater
Added new sprites, plus a redesigned Scizor one. Crater warps have been added but are glitchy as of right now
2022-12-14 10:43:20 +00:00
May Evans e7784604ce Faraway Island warp now works
Essentially, I bruteforced making it work; made the tiles we desire be warps for us instead. You do this by noting the bottom-left tile of the block for some reason, so tile $30 of forest will be a warp tile even though it really looks like it shouldn't be. As far as I can tell, there are no consequences for this war crime code as long as you don't put a warp where it shouldn't be.
2022-12-12 06:17:33 +00:00
May Evans d31edda1da Add Prof. Oak post-game fight
This was surprisingly easy to add, albeit a bit awkward. I learned how to add trainer battles without headers this way, so I may go back to CeladonU and restructure with this in mind.

This commit adds a fully functioning Professor Oak fight, using the Rival party choice script as a launchpad. You can desynchronise the choices easily, just a few number changes. I used the S. S. Anne 2F and Route 22 scripts to hodgepodge it together.

Because of how I did this, Oak is fully re-fightable, taking inspiration from XY Serena's daily re-fights.

I tried to add a Yes/No prompt, but it would still pull you into the fight, presumably because it's calling a beforebattle script before the code. It's a bit of a hassle and my CeladonU code sucked, so I decided to leave it out for now.

It's intended to be unlocked once you enter the Hall of Fame, thus that change there. That hasn't been tested properly so uhhhh *shrug*
2022-12-12 05:22:41 +00:00
emaskyesmogon 79110d859d Yellow and Japan Blue Encounters
Incorporated Yellow and Japan Blue's exclusive encounters into the wild learnsets if they were not there already
2022-12-11 18:51:37 -07:00
MementoMartha 76c185fae7 fixing a wrong name
gave Totartle the wrong name. oops!
2022-12-11 23:31:12 +00:00
MementoMartha 602a7386d4 Toedscools and Toedscruels and Wigletts, oh my!
Also reworded some of the dex entries a bit.
2022-12-11 23:21:03 +00:00
May Evans 4ea2cb6b4f Make arrow tiles in forest tileset warp-able.
This should resolve the issues with getting Faraway Island to work as desired.
2022-12-11 22:18:39 +00:00
May Evans 20e0248311 Viridian Forest & Route 24-25 tweaks
This reduces the amount of Para present in the early-game; my playtest had me feel that there were a few too many.

So what I did here was;
- Replace an encounter entry with Pidgey, which was seen in Yellow. Additionally, I replaced the Butterfree with the popular L9 Pidgeotto, which to me makes a lot more sense. You should grind for Butterfree.
- The end trainer uses a Venonat, a Pokemon I think we could feature more early-game (like in Yellow again)

Additionally, I also tweaked Route 24-25 to have the early Venonat like Yellow does. This ensures the Yellow learnset changes come into play. I also added Pidgeotto back here over the Butterfree, I still don't think it should be available this immediately...
2022-12-11 22:13:33 +00:00
May Evans b7973444b2 Myriad of changes!
This is a pretty hefty commit, so let's break it down.
- Fixes Pokedex entries for Bittybat, Bulbasaur, and Shellder.
- ...presumably fixes the options menu.
- Adds a Fishing Group and water wild data to Diglett's Cave, also reduces the encounter rate. More to come.
- Modifies parties, including evolving Rival 2's starter.
- Attempts to fix the Ultra and Safari Balls by making `BallFactor` 4, which appears to be the intended number. Tests yielded positive results.
- Restores a ton of Japanese references that got removed in localisation, including some errors.
2022-12-11 21:40:43 +00:00
May Evans a9b159505e Pokedex text update
This restores much of the 1996 Tajiri lore to the Kanto Pokedex. Sourced from Dr. Lava's translations.

You can see this as a more mature, uncensored Pokedex. It contains more biological details and relates the Pokemon to real-world animals. I believe this can enhance the "dreamy" feel of the region to some degree, but could be off-putting to newer fans.

Some Pokemon did not need new dex entries due to either sharing the information with the book, or being Mew.

Scream Tail's dex entry was also reworked due to overflowing.

Some grammar enhancements were also made.
2022-12-08 04:44:40 +00:00
May Evans 1042a9759b Finish the Pewter Museum of Science
This fixes all the bugs with the Scarlet Book and Sada. Thanks to Vortiene for the help!
2022-12-06 00:20:10 +00:00
MementoMartha c678a329a4 (hopefully) fixes 2022-12-05 22:40:59 +00:00
MementoMartha 1c865e8cae Adding some Gen 9 Pokemon 2022-12-05 20:50:34 +00:00
May Evans 1b0c9e6f8a correct associations for scarlet book & mt moon crater
spaced with actual names, not how it's rendered in-game
2022-12-05 17:52:14 +00:00
MementoMartha 280211919e Pokedex reordering, adding base data for Gen 9 additions 2022-12-05 17:38:15 +00:00