Commit graph

84 commits

Author SHA1 Message Date
Martha Schilling 5760e27617 Fixing the Brunswick Glade NPC bugs
Almost there...
2023-12-28 21:40:05 +00:00
Martha Schilling 543ea46d8e Koichi unique trainer class!
Well, 'unique' is VERY loose here. He looks and behaves identically to a Black Belt still, just with a proper name and a higher payout. He replaces the unused Junior class.

In addition, I've brought back the text on the scrolls on the back wall in the Fighting Dojo that were accidentally inaccessible for a while.
2023-12-24 22:18:00 +00:00
Martha Schilling 5305e19ca4 DK! Donkey Kong! (Huh!)
Finally, he's here for you
It's the last member of the KEP crew
This Mon's so strong, it isn't funny
Can make a Dark-type cry out for mummy
Can push a boulder with relative ease
Makes Strength puzzles seem such a breeze
He may move slow, he can't learn Fly
But this Mon's one hell of a guy!
2023-12-16 20:38:29 +00:00
Martha Schilling d71eb00054 Boss trainer movesets! (finally!)
Well, most of them, at least. All of the bosses before and including the Elite 4 have had custom movesets added, and I'll work on the remaining postgame trainers later. This still needs some testing to ensure they're all correct, but I'm committing this as is for now.
2023-12-13 12:00:11 +00:00
Llinos Evans 4dd40a5818 Brunswick Glade & Celeste Hill Trainers
I fucked up the Brunswick Glade trainers somewhere - some text isn't sync'd and they won't come up to the player. Otherwise, it's done.
2023-12-12 22:10:24 +00:00
Llinos Evans 61acbe44c9 Add Morimoto Boss Fight from LGPE
Uses the team from the LGPE boss fight; quotes are from a mix of games across the series; appears after the game is beaten.
2023-12-11 23:21:54 +00:00
Llinos Evans c3d92fb62f celeste/brunswick trainer groundwork
dist sucks but the parties are there

found unused trainers we could also dot around
2023-12-11 13:32:05 +00:00
Llinos Evans 791689c300 Voltorb/Electrode in Silph/Rocket parties
This gives various Rockets and Scientists Voltorb and Electrode, Pokemon that were discovered in Silph Co., to add a bit more immersion.

Naturally, Chief will use it too, which comes with the benefit of reducing Magnezone's insane prevalence in late-game parties.

Ruby Dex Entry:
> Voltorb was first sighted at a company that manufactures Poké Balls. The link between that sighting and the fact that this Pokémon looks very similar to a Poké Ball remains a mystery.
2023-11-25 12:48:48 +00:00
Martha Schilling d41d0e8e9a minor post-playtest fixes
- Moved one of the trainers in the Celadon Uni PokeCenter to stop him from being in the way of the nurse

- Buffed one of the Scientists in the Mansion

- Moved the nurse and Weezing trader on the SS Anne slightly

- Boosted Meltan's catch rate because having it be that low is ridiculous

- Increased Luxwan's height because real swans are not that small

- Changed a Cue Ball's party to allow his dialogue to make sense

- Wild level balancing around Vermilion City

- Fixed a small Pokedex display bug

- Text fixes
2023-11-25 08:48:01 +00:00
Martha Schilling 4384bc639d Improved Cinnabar Volcano + Mansion B2F!
- Cinnabar Volcano now requires Strength to complete, and contains several trainers, including 3 Firefighters.

- The entrance to Mansion B2F has been changed to a warp pad instead of a staircase.

- Removed the boulders in B2F to fix a bug and to prevent softlocks.

- Minor text fixes.
2023-11-24 11:36:14 +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
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
Martha Schilling c5eff723b1 A couple of bug fixes
More still need to be done but I'm separating the commits so I don't get overwhelmed lol

- Fixes a bug with the Up-Grade NPC in Saffron. He now properly shows up only after defeating Giovanni.

- Fixes a bug where Silph could be entered before receiving the Poke Flute.

- Silph Gauntlet 5F has a complete remodel, more closely matching the original map found in the leaks.

- One of the Fuchsia Gym Trainers no longer uses a repeat Arbok.

- Wiglett and Wugtrio could learn Rock Slide via TM, which has now been fixed.

- Jacky uses a Porygon in place of Machop, as it ties into his polygonal, Virtua Fighter-inspired sprite.

- Chief uses a Gengar instead of Porygon2 to represent the Silph Scope.

- Omega's and Giovanni 2's levels have been toned down slightly.

- Lance now uses Crocky over Aerodactyl.

- Yujirou's non-initial teams have had their levels reduced to be the same level as the previously-fought Gym Leader, rather than the upcoming one.

- Updated README with additional credits.
2023-07-21 19:35:23 +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 91e06763dd Adding data for Silph Gauntlet Trainers (2, 3, 5F)
Adds the trainers themselves, dialogue still needs to be written but PvK can help with that

Currently they either don't see you or challenge you multiple times...probably issues with where the event constants are located, will sort out once I figure out the problem
2023-07-15 22:07:51 +01:00
Llinos Evans ffd03c1b06 Populating Brunswick Trail
This adds three trainers to Brunswick Trail, as well as the lover NPCs Martha wanted to write dialogue for (with placeholders for now).

Most trainers are merely commenting on the strong and energetic Pokemon, which I think matches the racing theme it has going on. This can be changed if need-be.

I have also removed all the noise on the Fake Tree sprite that got added when I imported the tile. Now, it's far more convincing.
2023-07-15 16:30:26 +01:00
Martha Schilling 0852d5f725 A few bug fixes
- Fixed a bug where attempting to Fly on Celeste Hill caused a huge memory corruption effect. Oops.

- Fixed text issues on Route 1 and Museum 2F

- Tidied up trainer parties a little more
2023-07-12 14:16:41 +01:00
Llinos Evans 0659fb1c65 Finishing Silph Co. 11F
That's a fair chunk out of my day...

This commit finishes everything about Silph Co. 11F. DON'T. TOUCH IT. Unless there's a bug, but OTHERWISE, do NOT touch it. Holy shit.

Here's everything featured;
- Jessie and James fight, ported over.
- Rocket grunt changed to the appointment one from the strange room on the other side that really shouldn't be there tbh
- Omega fight now doesn't have the "watch out" text as I needed to do a micro-optimisation TRUST ME it was NECESSARY (it was not, in fact, necessary)
- Giovanni now reuses Beedrill and has a generally stronger team, scaling with the fifth Rival fight.
- Omega refight has been added after some toiling with the Team Rocket intro text that absolutely should not have happened but did for some reason AAA
- Rocket trio text somewhat tweaked

Oh and I ported over the balance patch on the stats, including some neo-Cryithan onboarding.
2023-07-09 11:43:32 +01:00
Llinos Evans ab72fa0e51 Trainer variety enhancements
- Toned down a significant amount of "repeats"; times where you repeatedly fight the same Pokemon or an evolution line.
- Integrated beta Pokemon more.
- Also, imported the LGPE retranslation of Bill. In Japanese, he isn't a PokeManiac, but a "Pokemon fanatic".
2023-07-05 20:03:31 +01:00
Llinos Evans 3866a69a25 Vermilion Officer Jenny, other things
- Adds Officer Jenny from Yellow to Vermilion City. Due to spriteset restrictions, Roingus Girl has been removed; the self-insert felt a little weird anyway.
- Fuchsia City's map has been redone a little bit to more closely resemble the LGPE version, being far more walkable and aesthetically appealing.
- A Firefighter has been added to Cerulean Gym!
2023-06-30 21:51:05 +01:00
Llinos Evans 1a68db3227 Post-Playtest Hotfixes
- Eevee and Pikachu family's growth rates are changed to Medium Slow. This gives them a much better early-game power spike that tapers off momentarily. They will level up faster until Level 68.
- Yujirou's levels and one pre-gym trainer are slightly nerfed, being easier for players starting out.
- Caterpie and Weedle in Viridian Forest have level deviation, and Pikachu is tapped on the wrist to not make the starter too redundant; change here is pending.
- Debug uses Pikachu and Eevee starters for future starter-based testing.
2023-06-05 02:17:54 +01:00
Martha Schilling 4997045bae
Update parties.asm
Should be nearly all the gauntlet trainers done now, just a few more that need to be finalised.
2023-05-24 15:47:52 +01:00
Martha Schilling 939800e5ff
Update parties.asm
Adding a couple more Gauntlet parties, will properly refine soon
2023-05-23 12:08:06 +01:00
Llinos Evans abaff60797 Refactor Giovanni's Room, restore Rocket Hideout B1F
With the way KEP is shaping up, the Rocket Hideout can easily stay with little issue. I don't expect it to be a problem at all. Therefore, in the interest of keeping Lavender Tower's progression the same, it's being restored. I do expect some Lavender Tower floors to be nommed, though.

I expect Silph to also be salvageable but I also really hate Silph.

Oh, also, the Game Corner guard has been buffed. He sucks. They call that a guard??
2023-05-02 02:48:41 +01:00
Llinos Evans 4c892ce51a Minor improvements from to-do list
Celadon University JrTrainerF is now a Student, replaced Eevee on Cycling Road.
2023-05-01 19:45:30 +01:00
MementoMartha ba78014ec6 Silph Gauntlet 4F trainers!
Includes the same healing pad that was in Lavender Tower, as a reward for getting halfway! Trainers can't currently see you, which I'll fix once I've added the trainers on 2F and 3F.
2023-04-27 19:55:35 +01:00
MementoMartha 0b334abbf3 Silph Gauntlet 1F trainers!
Currently working fine except the trainers can't see you, which I'll try fixing soon
2023-04-25 03:15:43 +01:00
Llinos Evans 2f82c377fe Ok the fight works now
Issues:
- Player only walks one space for some reason
- After battle text doesn't happen, so no Candy Jar

Otherwise, almost finished.
2023-04-25 00:47:19 +01:00
Llinos Evans ca1cc6af90 Some progress on the Chief fight
Right now I'm facing a weird bug where if you enter, you get the quote, but the fight doesn't start and it happens while you're stepping for some reason. Very odd.
2023-04-24 23:22:35 +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
Llinos Evans 437602bf21 hm m yes carapthor
Altered the back sprite to be accurate to beetle wing cases, and changed the S.S. Anne Gentleman to use Carapthor (and Mr. Rime).
2023-04-22 17:07:05 +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
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 7e8c16c5a6 Viridian Pre-Gym populated
This finishes Viridian Pre-Gym save for making trainers see you.
2023-04-15 19:50:49 +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 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
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