Commit graph

590 commits

Author SHA1 Message Date
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 2f01628cd9 Groundwork for Tradeback Move Tutor
Currently the move tutor is a little bit broken - the IDs are 1 above how they should be. Shell speculates that it's searching at the table starting from Kangaskhan due to the way the decrements shake up but it may just be making things more complicated than they are.

Big cheese code is `PrepareTradebackMoveList`, it's where things are mucking up.

Also, the code can be significantly optimised, as it's currently being adapted from the function above, `PrepareRelearnableMoveList`; It doesn't need to check levels, for example.

Note that the relearner functions properly, so use it as a reference. I may have removed something important.

Technically, we could have NO_MON as an entry which may make things shake out properly. But I'd rather have a proper fix.
2023-04-23 06:11:05 +01:00
Llinos Evans 5e21c159f9 FEROCIOUS KICKS AND PUNCHES
This adds the Mega Punch & Mega Kick guys from FireRed and LeafGreen.

Given Mega Punch was in Mt. Moon, and GF replaced it with Thief in FRLG, I decided to change the TM to the Wing Fossil, which currently isn't obtainable outside of Mt. Moon Crater.
2023-04-23 00:26:33 +01:00
Llinos Evans 9f86539800 Close up Kanto again
This reverts some of the opening-up stuff we did. I kept the Cut Trees around Vermillion and Celadon Gym packed away, as they aren't problematic and forcing HMs in gyms is cringe. But, the absurd skips made possible by the other Cut Trees being gone is way too much - Celadon is a huge power spike and it throws Martha's fishing balancing off the rails.
2023-04-22 23:40:30 +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
Llinos Evans e5c0587e08 capitals!!! 2023-04-22 10:26:14 +01:00
Llinos Evans fb9977457a Carapthor dex entries
4 martha
2023-04-22 10:24:49 +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 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 8021cbdf04 Merge branch 'master' of https://github.com/dannye/pokered-crysaudio 2023-04-19 21:08:01 -05:00
dannye 772520c2c2 Merge branch 'master' of https://github.com/pret/pokered 2023-04-19 20:04:38 -05:00
MementoMartha 74ae2431b2 Changing order of city maps
This is purely to make the order in the fly menu make sense.
2023-04-19 10:31:09 +01:00
MementoMartha 8ce4472f7d Polishing Celeste Hill a bit
Also added a small house on Route 1 which we can use for testing maps
2023-04-19 10:19:20 +01:00
Llinos Evans 91d47bef0e Celeste Hill & tileset
This adds the baseline stuff for Celeste Hill. The map, the tileset, and so on. No events or warps are currently available.
2023-04-18 17:30:57 +01:00
MementoMartha 89b0687a4b Kokana line base stats
Also adds Dragonair's and Nite's Yellow catch rates, and rewords Taaban's entry slightly
2023-04-18 16:01:31 +01:00
MementoMartha bfcc8de9f4 Goodbye Para, hello Taaban 2023-04-18 14:57:43 +01:00
MementoMartha c92b422b62 adding Taaban sprites 2023-04-18 13:37:48 +01:00
Llinos Evans 3d2e8a719f citrine water wild data 2023-04-18 07:49:03 +01:00
MementoMartha a6065bd576 Update parab.png 2023-04-18 07:37:23 +01:00
Llinos Evans e234d77c24 Citrine grass encounter fix
Had to hardcode the tile to work. Yeah.
2023-04-18 07:33:35 +01:00
MementoMartha 19762488ae Updated a few sprites 2023-04-17 22:44:11 +01:00
Llinos Evans da7d31479e bike should be ride-able in citrine 2023-04-17 19:55:58 +01:00
Llinos Evans 04b4fb66cf citrine grass
i was just dumb
2023-04-17 18:49:00 +01:00
Llinos Evans 094869ab5e Citrine geography rework, Metal Coat
Lots of things here. Citrine now has its own tileset featuring content from the prototype asset leak. This includes new grass, signs, and so on. Lots of tinkering had to be done to make it look good, but it does! Collision and everything is done, but grass needs to animate properly. I'm committing as-is because making the grass animate is actually very difficult.

Also added the Metal Coat and fixed the issues with prior evolution methods - evo items first, level-up second. It is currently unobtainable.
2023-04-17 18:40:30 +01:00
MementoMartha 6c43b45213 a few small bug fixes
mainly, making the SS Anne come back after getting the Marsh Badge, cause otherwise it would be useless.
2023-04-17 17:29:58 +01:00
Llinos Evans f58d06d64c Hitmons in Victory Eoad
Really cool LGPE encounters that go a long way in making Victory Road's encounters more interesting. Will have further review in the future.
2023-04-17 15:24:58 +01:00
Llinos Evans 8d5a424f3d Dehyphenate regional names
Hyphens are cringe unless it's P-Z.

Also Lax blocks Fuchsia but not Lavender now because that makes more sense.
2023-04-17 10:40:54 +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
Capucine Meyer abc333ca81 omega battle works 2023-04-15 20:10:39 +02:00
Llinos Evans da13aa9a32 WIP Omega Event
So this isn't working very well. It's halfway there and worked exactly once with what I can only describe as a cosmic ray event.

Here's how it's intended to work: Right as you open the Card Key door, Omega comes barging through, having previously been fighting with Giovanni.

The walking and stuff seems to work, but there are three issues:
- Omega's battle doesn't start, causing a softlock. `call TalkToTrainer` seems to be the iffy point. Note that this code is usually used when talking to a static entity.
- The music bugs out as Omega walks over; this may be linked to the above problem.
- Once these issues are alleviated, Omega will have to disappear, but this isn't a massive deal.

Also includes a dev door in Red's room to easily access the event, and minor code cleanup with Viridian Pre-Gym and Oak's lab - just unnecessary comments.
2023-04-13 17:13:11 +01:00
MementoMartha 90fc563b57 Update new_dex_text.asm
Reworded Weezing's entry to make it fit, since the last line was one character too long
2023-04-11 13:51:31 +01:00
MementoMartha be78eb9b84 Citrine is now golden
That's it
2023-04-11 13:26:04 +01:00
MementoMartha 0cd8cafc58 Citrine time!
Added map data for Citrine City, including wild spawns, as well as a fly location. Also fixed an issue where Bill's Garden couldn't spawn wild Pokemon. Citrine is also green for some reason.
2023-04-11 12:52:53 +01:00
MementoMartha c7499a1fd2 Removing MissingNo to make room 2023-04-09 20:41:31 +01:00
MementoMartha a0cc8d52b0 Tauros.
Tauros.
2023-04-09 19:35:01 +01:00
Llinos Evans c75f968931 Update text_7.asm 2023-04-09 19:33:13 +01:00
Llinos Evans 77fd55ea49 Add regional trades, break trade limit
All over the place! S.S. Anne doesn't work properly though.

Thanks to Chatot4444 for bypassing the trade limit.
2023-04-09 18:56:19 +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
Llinos Evans 7e3d48513b Add Meltan Event
A guy in a Safari Zone Rest House will hand you a Meltan he found lost. It's built off the Lapras guy in Silph.

Also changes the positions of some trader NPCs in the Pokemon Centres to match the others.
2023-04-09 14:48:04 +01:00
Llinos Evans 4389e86fd1 Revert "Revert "Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack""
This reverts commit e772de43d5.
2023-04-09 14:03:02 +01:00
Llinos Evans e772de43d5 Revert "Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack"
This reverts commit 9bf8886d4b, reversing
changes made to 8cf1ba9fc9.
2023-04-09 14:02:08 +01:00
MementoMartha 377e23038b Fixed the aforementioned warp issue 2023-04-09 13:59:41 +01:00
Llinos Evans 3f6005f3f1 Refactor Item Constants
Alright, never put items after the floors. This is very, very bad, as it actually causes a myriad of problems whenever the game tries to assert the item list on its lonesome. Effectively, this has been adding floors. This caused the item descriptions to be offset by 21 spaces once you get to the TMs. The fact it worked before was a miracle.

Anyway, all considerations have been made when doing this, so it should all be just fine.

If you need to test if the items are ok, check the Up-Grade on Porygon, as it's the last in the list. Checks showed it was ok for me.

Also, Old Sea Chart now uses the localised name - Old Sea Map. This actually fits in-game, which is good.
2023-04-09 12:25:10 +01:00
Llinos Evans b0d17719db Regional trades for new forms
Sandslash and Raichu stopped working - hypothesis is correct.
2023-04-08 23:37:36 +01:00
MementoMartha 4baf396498 Dugtrio-A and Ninetales-A! 2023-04-08 14:59:04 +01:00
Llinos Evans 8b95d592ec More regional trades
None of them work properly due to a bug but it's no fault of the events themselves.
2023-04-08 02:00:25 +01:00
MementoMartha dc4fe39707 actually adding the next batch of regional forms
Includes Golem, Rapidash, Exeggutor and Marowak.
2023-04-08 01:16:52 +01:00
Llinos Evans ed1ced807b Regional Trades!
- Regional trades now dummy out the "-A" thing etc so they look nice
- Added Celadon, Saffron, Viridian, and Vermillion regional trades
- Added Galarian Sidegrade trades to the S. S. Anne, but Perrserker and Sirfetch'd specifically don't work. I have zero clue why, as they work the same as the rest.
- Corrected grammar in the "Happy" text when you finish a trade
2023-04-08 01:05:15 +01:00
Llinos Evans 6c104fc97c Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack 2023-04-07 23:14:41 +01:00
MementoMartha 64a9fdbf00 A few Alolan forms!
Adds Raticate, Raichu, Sandslash and Persian. Also updates Hitmontop's sprite.
2023-04-06 12:29:09 +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
MementoMartha c9833e5d91 wug
Replaces the nonsensical Crocky static with a more fitting Wugtrio encounter. Currently (hilariously) makes the Champion theme play in the battle, working on a fix later
2023-04-05 23:20:22 +01:00
MementoMartha 3e6e9ea240 T R A N S R I G H T S
Gave Sylveon the same palette that's used in Fuchsia.
2023-04-05 23:01:41 +01:00
Llinos Evans a02a886064 Konya learns Pay Day earlier
Doing this for extra early-game utility, which I think players will enjoy.
2023-04-05 17:22:33 +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 c948e77d01 Level 1 learnset changes
- Marowak has Tail Whip to ensure it gets its entire learnset - currently can't, as Yellow creates a weird incompatibility if caught the way it currently is.
- Gyarados is given its Yellow learnset, as chances are it's being made fishable and thus needs it to be of an appropriate power level.
- Stone Evolutions I changed are nerfed to balance the Move Relearner properly.
2023-04-05 16:12:29 +01:00
MementoMartha 8ab3e1f2be Added Underwater Tunnel!
This is a cave that connects Bill's Lighthouse and Route 10, only accessible after Surf is obtained. Contains a static Dragonite as a reference to the anime!
2023-04-05 12:31:11 +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
Llinos Evans c9b4c2acb9 SHE FORGOR
*points* SHE FORGOR
2023-04-04 20:35:40 +01:00
May Evans 846b2f35f6 comedy
means that when someone encounters these, magic happens
2023-04-04 20:00:12 +01:00
MementoMartha 4606a3d863 Hisuian Arcanine and Electrode!
(also another title screen graphic since we can never settle on which one looks the best)
2023-04-04 19:58:41 +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
MementoMartha c4d780b8c7 Finally adding Meltan and Melmetal!
Also had to remove Mr. Mime-G since I forgot to add Alolan Persian and Raichu. Oops.
2023-04-04 09:34:23 +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 bd23dfa61e Many, many tweaks (Move Relearner!)
- Move Deleter and Move Relearner are added, featuring updated code from Shin Pokered, which took the code from Mateo's Red++ hack. They replace the Trader in Celadon University. The code has been updated quite a bit to fit the modern standards of pokered.
- The Trader has been moved to the trade room in Cinnabar Lab, which is thematically appropriate.
- Eevee's L1 learnset now appropriately features Tail Whip; this was a mistake made by Martha when porting Yellow learnsets.
- Fast Text cursor slot is fixed
- New ROM Bank stores the new maps as it got full when adding the move relearner/deleter - Maps 21 will still have space though.
- WRAM has been fiddled with, please please read the notes if you edit the Move Relearner area, it needs quite a bit of space.
- Wild data for Mt. Moon and Route 22 has been tweaked a little bit.
2023-04-02 19:56:44 +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 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
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 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
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 3f691fcb21 Merge branch 'master' of https://github.com/pret/pokered 2022-12-28 17:38:38 -06: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
May Evans 9ed18b1d8f Work on the Scarlet Book & Wild Data
* Wild data added to the Mt. Moon Crater
* CoolTrainer NPC (young Sada) added to the Pewter Museum of Science.
* [EXPERIMENTAL] Added the Scarlet Book to the hidden item list for the Pewter Mueseum of Science.

Notes;
* This commit will not work without SV Pokemon being implemented.
* The Scarlet Book has not been placed correctly. The tileset for the museum doesn't load properly in Polished Map, so I'm kind of stumped. Neither has Sada.

Things to do:
* Add an NPC to Mt. Moon B2F that blocks off the crater, along with a warp there. NPC should disappear when you have 8 Gym Badges.
2022-12-05 01:49:52 +00:00
May Evans 255ffaf929 Add Mt. Moon Crater
The map functions and the ROM builds. It has no wild data, and nothing goes to it.

What's done;
- Map design, I think this is one of the best I've ever done, especially within these limits.
- Integration, set up a warp and you can go there, easy.

What's not done
- Wild data
- Fishing group
- Water mons
- Event signs
- Young Sada in Pewter Museum of Science

Very simple map to produce.
2022-12-05 00:07:16 +00:00
May Evans 964bacd52a Re-enable silph warps
This is the bare minimum for Silph to function as a location. No complicated trick warp tiles yet.
2022-11-11 10:13:49 +00:00
MementoMartha 2b3da5e254 A few fixes + added Blahaj cameo
Copycat now has a Jagg plushie in her house, referencing the amazing IKEA shark.

(note that KEP is not sponsored by IKEA)
2022-11-04 11:12:44 +00:00
emaskyesmogon 6213d683ce Attempting to add early Celadon City
The map changes won't load but the warp data works
2022-10-31 17:25:07 -06: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
MementoMartha 87fdb46ede Adding temporary warps to Faraway
Note that Faraway is still broken, the inner forest can't be accessed for some reason
2022-10-18 00:16:31 +01:00
May Evans 86f111e5d7 Revamp Pokemon Mansion B2F
This was hell to do. There is still one bug in there, and that's the item pickups don't work for some reason. I don't know how these work honestly so if anyone wants to sort that go ahead.

Anyway, some stuff on the map;
- Currently, a warp from B1F leads there, which is intentionally non-returnable. The player walks through the whole map to get to the warp panel. A walk of humanity's shame, if you will. A warp for where the player is meant to go will be necessary later.
- Lore from Japanese media, particularly the first movie's interpretation of Mewtwo, is included. This is based on context clues on its canonicity from LGPE and other bits.
- A clue on how to get the Old Sea Chart is not-so-subtly included.

The MissingNo. event is unfinished, I intend for Martha to deal with that. The text intentionally lacks a "done" bit to force an unpredictable error; I believe this is inconsequential gameplay-wise and should make for a good opening quote when fighting it.

Oh, and Faraway Island has Mankey, Butterfree, and Primeape as find-able Pokemon now. This should be expanded upon later.
2022-10-17 16:57:42 +01:00
May Evans 97cb4cfaf3 Add another CeladonU NPC
This is a reference to another bit of the Tamamushi booklets, where they talk about the Pokemon that can fly without wings.

Also, shortened one of the text chains. In general, they need to be much shorter.
2022-10-17 13:09:14 +01:00
May Evans fce6c3221c Add Pokemon Mansion B2F
Very dissatisfied with the map as-is. Needs a lot of work, possibly another tileset based on the `interior` one. I tried adding one but came across constant problems and the one I came up with kind of sucked. No events or warps yet.
2022-10-16 12:10:50 +01:00
May Evans 78ae4e9029 Move Mew, add Old Sea Chart, add wild data
I am 90% sure something will bug out, can't test the map right now for obvious reasons. Tested everything else, though.

Mostly copied data from Cinnabar Volcano while commenting out Vermillion Dock Mew info to move it.

Wild data has been added along with a fishing group, just dummied out slots.

Old Sea Chart is a clone of the Citrine Pass which is all it needs to be. It is obtainable near the truck.
2022-10-16 09:05:26 +01:00
May Evans 4cc05243ed Free roaming from Cerulean, add Faraway Island sign
- Replaces tiles east and west of Cerulean so you can roam back to Mt. Moon and over to Rock Tunnel with no issue.
- Adds the Faraway Island sign, with a - "JI" bit to represent Mr. Fuji. This was in the Japanese release, but never got translated internationally. "I depart" may need fine-tuning, as it implies he died; this was a mistranslation, obviously.
- Added a text bank for the Mew encounter to make Martha's job easier later.
2022-10-16 07:46:08 +01:00
May Evans aa32cfec8d Add Faraway Island maps
This adds the maps on their own with fully functional warps between each other. Music has been set to Viridian Forest. Mew, wild data, and a way to get there have not been added.
2022-10-15 23:00:57 +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 c3fd568b7b Finishing the Gauntlet maps
All the trainers are still missing, as is the guard. But the maps themselves are accessible, and the wild encounters work too.
2022-10-13 23:27:30 +01: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 a05796ece5 Citrine Pass and a few little tweaks 2022-10-02 17:16:30 +01:00
MementoMartha f6f43781b8 PZ, Magnezone and the Dubious Disc 2022-10-01 20:53:37 +01:00
emaskyesmogon 4a5d936e1b Merge branch 'master' of https://github.com/plaguevonkarma/kep-hack 2022-10-01 13:02:15 -06:00