Commit graph

3054 commits

Author SHA1 Message Date
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
Vortyne 17eaf761e3
Name some unnamed animation constants (#396) 2023-03-25 23:31:59 -04:00
RainbowMetalPigeon a76ae055cc
Dex weights are in tenths of a pound 2023-03-25 23:28:55 -04:00
May Evans 73784d619a fuck 2023-03-25 23:00:36 +00: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
dannye e3a3e6dbd6 Fix Drumkit6 2023-03-16 00:00:46 -05:00
May Evans bd067fa5a4 Update readme, revert Celadon Mart Dragon Rage change
Because Celadon University has the Dragon Rage TM now, Take Down can be back in the mart. It's more applicable and doesn't give you too big of an early-game power spike.
2023-03-09 04:27:34 +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 8c3857b097 Update README.md 2023-03-08 03:27:58 +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
SatoMew 5c4795d5bc
Complete and improve debug name labels (#408) 2023-02-26 11:14:21 -05: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
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 e076ee0a40 Add list assertion to TrainerNames 2022-12-28 21:48:55 -06:00
vulcandth 20ebfd079f
Add table assertion to TrainerDataPointers (#403)
* Add table assertion to `TrainerDataPointers`

* Add table assertion to `TrainerNamePointers`
2022-12-28 21:47:27 -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 ebeb442fef Remove even more unnecessary original audio files
to avoid any possible confusion
2022-12-28 20:55:33 -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
MementoMartha ba8ca1e80a Update mr.rimeb.png
Should hopefully fix an issue that happened sometimes with building the hack
2022-12-25 16:30:36 +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 25b61f95be Update README.md 2022-12-17 19:00:31 +00:00
May Evans 75b59760df Corrected gym scaling for Brock
Thanks to Chatot4444!
2022-12-17 19:00:21 +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