Commit graph

262 commits

Author SHA1 Message Date
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 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
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 abb9ab6aac BAD! BAD!!!!
These lines are NOT necessary and bug out the trainers lol
2023-03-29 21:42:32 +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
May Evans 492a410235 Update OaksLab.asm
This fixes the Rival's entry after getting the parcel. The new Oak's Lab should be finished.
2023-03-28 22:47:48 +01:00
May Evans 188da49450 QoL Tweaks
- Brock skip works properly
- Removed a Cut tree south of Cerulean
- "disabled!" is now "Disabled!" because the grammar burned my eyes
2023-03-28 20:02:22 +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 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
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 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 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 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
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 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 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
May Evans 99fa5a27b9 Fix Mt. Moon Crater and Oak team choices 2022-12-14 20:03:55 +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
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
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
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
MementoMartha 1e7613f804 Adding a stable MissingNo, and fixing a few minor things 2022-10-31 23:09:41 +00: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 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 2c81593537 more fixes 2022-10-01 13:15:58 +01:00
MementoMartha 830c3c3b1d more back door edits 2022-10-01 13:03:53 +01:00
MementoMartha a10c48a514 fixing a bug, adding a trainer 2022-10-01 12:23:58 +01:00
MementoMartha 91344e05e8 Rocket hideout improvements/changes 2022-10-01 11:38:00 +01:00
MementoMartha c6a0566063 fixing some errors with items 2022-09-30 16:54:56 +01:00
emaskyesmogon 22c4561b35 New Evo Items
Based Martha can fix
2022-09-30 09:37:46 -06:00