Commit graph

69 commits

Author SHA1 Message Date
dannye 772520c2c2 Merge branch 'master' of https://github.com/pret/pokered 2023-04-19 20:04:38 -05:00
MementoMartha bfcc8de9f4 Goodbye Para, hello Taaban 2023-04-18 14:57:43 +01:00
Llinos Evans 565734b50a Open up Kanto, extra party tweak
This moves Snorlax as Ema suggested and removes the Cut tree in front of Surge. This is to stay in-line with the current idea of an open-world Kanto.

Also changes the Magmortar trainer in Cinnabar as that's Blaine's ace now.
2023-04-17 10:30:12 +01:00
Llinos Evans 867cd03b02 Party tweaks
Mainly targeted at the gyms. Generally increasing Pokemon variety and ensuring they match the types in said gyms. Also restored all the rockets so they stop loading undefined teams.

A party for the Firefighter has been made to add to Cerulean Gym later. Seemed appropriate.
2023-04-17 10:22:39 +01:00
Llinos Evans 37441ea4eb Giovanni tweaks
- Decilla replaced with Beedrill. Decilla doesn't make sense, as he uses Ground-types, which Decilla isn't. Beedrill was given as a subtle manga reference.
- Nidorino -> Nidoking as it just doesn't make sense to see one at Silph Co. Could be changed further as his team is, generally, pretty terrible.
2023-04-15 20:28:28 +01:00
Llinos Evans 7e8c16c5a6 Viridian Pre-Gym populated
This finishes Viridian Pre-Gym save for making trainers see you.
2023-04-15 19:50:49 +01:00
MementoMartha 3d7d98c894 Adds in the rest of the regional forms
Also, need to fix an issue with the dex.
2023-04-09 16:56:30 +01:00
MementoMartha 4baf396498 Dugtrio-A and Ninetales-A! 2023-04-08 14:59:04 +01:00
Llinos Evans 206dced582 tweaks 2023-04-06 11:56:40 +01:00
Llinos Evans 2299dcdc0e Bug fixes from playtest
- Puts back Channelers to allow progress for now; currently goes to undefined places
- Tweaked two trainer parties with odd mons
- Jessie/James sprite in proper place
- Put little girl text back because it caused a problem
- One Celadon Gym cut tree removed to allow cut-less progress
- Fixed the rival picking the wrong team vs eevee
- Fixed the rival loading wrong in s.s. anne
2023-04-06 02:22:34 +01:00
Llinos Evans 51c248fe43 Jessie & James sprite
To use at...some point, idk when
2023-04-05 17:12:45 +01:00
Llinos Evans c7510aea57 TECHNOLOGY IS INCREDIBLE!
With me moving the Trainer AI elsewhere, I was able to optimise the party stuff a little bit. There's a lot more space and from what I can tell it works fine.

There are now three separate files - one for standard trainers, one for the rival & oak, and one for scaled parties (aka gym battles and related). This is mainly for organisational purposes.

If I run out of space again, I'll rework the Trainer AI script to pull parties another way, storing the party files in individual banks.
2023-04-04 20:56:48 +01:00
May Evans 4669dbc53a Extra trainer classes, new bold P
I changed the P image to match the font used in the prototype assets.

Also, because Yujirou has a pic all alone in that one bank, I added the other 4 beta trainer classes that never got used. They're all ready to be used, just need teams and a place to go, but I want to address trainer line-ups last code-wise.
2023-04-04 19:28:02 +01:00
May Evans fc597000fb Fix trainer sprite loading
Moved Yujirou to the end of the file and made the bank switching code more efficient, was swamp code before.
2023-04-02 21:37:57 +01:00
May Evans 67132fefcb Yujirou Event Scripting, half-finished
This code has a lot of problems with solutions that me and Frrf can't seem to figure out. We've taken a lot of references from Erika's Gym but we've got many bugs after Yujirou is defeated, such as one case where you end up instantly doing the rematch fight, which is insane because there's no way this can actually happen.

What's committed is a fight that can be re-fought when it shouldn't.
2023-03-30 21:01:18 +01:00
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 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 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
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
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 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 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
MementoMartha 280211919e Pokedex reordering, adding base data for Gen 9 additions 2022-12-05 17:38:15 +00:00
MementoMartha 1e7613f804 Adding a stable MissingNo, and fixing a few minor things 2022-10-31 23:09:41 +00:00
MementoMartha bb319e89b3 A few minor fixes
Alters a few bugged texts, still need to fix Faraway's entrance tile
2022-10-29 23:01:34 +01:00
emaskyesmogon afd1796487 Update special_moves.asm 2022-10-15 14:08:09 -06:00
emaskyesmogon a35fc22072 optional and nerfed brock 2022-10-14 17:51:37 -06:00
MementoMartha a8f7c62ffe Fixing the recover bug! :D
Also some minor text and trade updates, too
2022-10-13 17:18:23 +01:00
MementoMartha c8656b19f5 If you can't fix 'em, add the gauntlet.
Adding the maps for Silph's Gauntlet, along with Albatross's Galarian Bird sprites. Also fixing Blottle's typing, and temporarily replacing the effects of the recover moves.
2022-10-12 23:25:59 +01:00
MementoMartha e2198dd402 Para! 2022-10-01 15:55:30 +01:00
MementoMartha a10c48a514 fixing a bug, adding a trainer 2022-10-01 12:23:58 +01:00
May Evans 63ea628392 Stone Evolution L1 Learnset Improvements
Because these Pokemon cannot be captured in the wild, this exclusively buffs the trainers, and by a significant amount too. I left Starmie out to balance out the early-game given how powerful it can be.

Ninetales should be at least L42 in each encounter to account for Fire Spin.

Vileplume and Bellossom should be at least L38, but I think Erika puts Mega Drain over Petal Dance so she should be fine..?

Tsubomitto should be L40+ to account for Lovely Kiss.

Exeggutor should be at least L48+ to account for Sleep Powder.

Cloyster should be at least L23 to account for Clamp. To nerf it, increase its level to 50, where Spike Cannon replaces Explosion.

I have also done a few fixes and stuff;
- Magnezone is part-Steel
- Leafeon gets Swords Dance
- Added Silph Gauntlet Team for the Channeler, assuming L65 is what will be used.
2022-09-30 14:33:29 +01:00
May Evans 147f5104c8 bit more? 2022-09-30 14:08:05 +01:00
May Evans fd8c515c47 forgot one of them... 2022-09-30 14:04:45 +01:00
May Evans 767f76b4e3 Improve & mark the Channelers
The Channelers now use more varied parties, adding Mikon, Vulpix, and Cubone to match Lavender Tower more effectively. This could still be improved further.

Unused Channelers have been marked for future use.
2022-09-30 13:57:33 +01:00
MementoMartha fe33ec1040 Electivire & Magmortar! 2022-09-29 17:00:48 +01:00
MementoMartha fece27f7c2 6 more Pokemon!
Animon, Bellossom, Porygon2, Kingdra, Politoed and Slowking have been added fully.
2022-09-29 13:54:40 +01:00
MementoMartha 0e770f33d7 made an error, fixed now 2022-09-28 14:58:02 +01:00
MementoMartha f9d86cdde9 Town Map and PC stuff 2022-09-28 13:43:17 +01:00
MementoMartha d8cb5a331f polishing the added pokemon a little 2022-09-27 22:58:06 +01:00
May Evans 19d5f2293c Add trainers to Celadon University, add two new salesmen, etc
Overall completes Celadon University sans a problem with sprites being a bit corrupted until you leave. New Magikarp Salesman-esque events in other pokecenters which is kinda neat
2022-09-27 16:06:13 +01:00