Commit graph

3438 commits

Author SHA1 Message Date
May Evans 8f809124d0 Concrete Bill's Garden wild data
This tweaks the wild data so Aerodactyl, Omanyte, and Kabuto are in the water. Also diversified the Squirtles and added slots for the Hisui formes to use once they're in.
2023-03-06 12:23:45 +00:00
May Evans 22236d2072 Add Dubious Disc Salesman
This adds the Dubious Disc Salesman to Cinnabar Pokemon Centre. I chose this area because it's late in the game and it seemed a bit iffy to constantly have to go with Pokemon Centres not in towns. Cinnabar has some connection to Silph, so it makes more sense than just balancing.

There are probably improvements that could be made (eg. a quote as you buy) but the salesman code is surprisingly brittle so I'd rather not break stuff for hours for something that already works perfectly fine.
2023-03-06 05:14:19 +00:00
May Evans bcb67db573 Bill's Garden, add Rowan NPC
Rowan NPC added to Cinnabar Lab, just a little cute thing.

Bill's Garden could see many revisions, what's here is the bare minimum. Here's what's done:
- Nidorino NPC blocks it off and is unlocked in the post-game. This currently contradicts the myth - I have a plan for this soon.
- Wild Pokemon are the "non-reproducibles" given in Stadium; starters and eevee are mandatory given those were common in the myth
- Hisui forms should be added when possible
- I had to remake Martha's map in the forest tileset so leaving would be possible
- Everything is at a point where it functions
2023-03-03 10:41:28 +00:00
SatoMew 5c4795d5bc
Complete and improve debug name labels (#408) 2023-02-26 11:14:21 -05:00
May Evans 1d49a84b7e Framework for Regional Trades
This implements much of the stuff Martha wants for the regional forms.
- Alola forms have trades; version exclusives moved to Pewter
- Galar forms will be on the S.S. Anne to promote returning
- Regional form evos will be on the S.S. Anne possibly? Maybe something else.

Also contains a similar-to-LGPE trade quote. Extremely compressed quotes.
2023-02-24 11:42:38 +00:00
May Evans 86f6151a17 A few cool changes
- Pokemon Mansion has a Guard NPC now
- Professor Oak now plays the Champion theme when you fight him.
2023-02-24 00:05:16 +00:00
May Evans a85c26b7d3 LOTS of things
- Replaces the Old Rod with the Candy Sack, an item to evolve Meltan into Melmetal. Meltan and Melmetal aren't in yet.
- Improves Gym Leader and Elite Four AI by a lot. They still use items, they're just better. Fixes XSpecial use while we're at it; before, it didn't actually increase the stat...
- The Scarlet Book now takes up both shelves, one section for each Paradox Pokemon. I also moved the bookshelf so it looks nicer.
- Text in Celadon University has been reduced significantly, taking up less memory and being a bit more RBY-like. It has also been made more accurate (thanks to Daiginjo for translating my booklet!)
- The Magikarp researcher in Celadon University now gives TM Dragon Rage (no longer unused!)
- Added a guard for Mt. Moon Crater.
- Removed TrainerNamePointers, Blank Leader Name Code, and Dakutens/Hakutens using a guide published by YakiNeen.
- PP no longer uses a shitty graphic and is instead properly implemented into the font, optimising the status screen. Also displays in-battle which is kinda cool.
- Lorelei, Bruno, and Agatha now play the Gym Leader theme, not just Lance.

Still unsure how to fix Celadon University's trainers, all I know is a lot of the information should be taken from the Oak fight I did. The code is radically different and doesn't call trainer headers at all. You'll likely want to start from scratch.

The Mt. Moon Crater Guard's text is a little wonky, not sure what's up there. May have been from the way I accessed Mt. Moon in testing. Anyway, if you want to mess around feel free.
2023-02-19 06:25:33 +00:00
MementoMartha a3f3763f4d New sprites, a few bug fixes/tweaks
All of the Ubers have sprites now (goodbye Lion Pory2!), fixed a small bug I made on Route 19 when resizing Cinnabar, and some minor text updates/fixes.
2023-02-08 17:13:44 +00:00
dannye 5357fee84f Update TCG2 songs
they actually don't sound half bad now!
2023-01-14 00:09:25 -06:00
dannye 867f70ab1e Update TCG songs 2023-01-13 21:58:00 -06:00
dannye aab4d20881 Update TCG songs 2023-01-13 21:07:04 -06:00
dannye cf42c6ee65 Fix pitch_slide on channel 2 and 3, part 2 2023-01-01 20:33:32 -06:00
dannye 610521f77a Fix pitch_slide on channel 2 and 3
thanks to TempoQuill
2023-01-01 19:54:26 -06:00
dannye e076ee0a40 Add list assertion to TrainerNames 2022-12-28 21:48:55 -06:00
vulcandth 20ebfd079f
Add table assertion to TrainerDataPointers (#403)
* Add table assertion to `TrainerDataPointers`

* Add table assertion to `TrainerNamePointers`
2022-12-28 21:47:27 -06:00
dannye fc059d36af Remove the inc_section macro
the idea is nice, but it thwarts make's dependency change detection
2022-12-28 21:25:19 -06:00
dannye ebeb442fef Remove even more unnecessary original audio files
to avoid any possible confusion
2022-12-28 20:55:33 -06:00
dannye 3f691fcb21 Merge branch 'master' of https://github.com/pret/pokered 2022-12-28 17:38:38 -06:00
dannye 4a10ab5b8f Fix tcg2 channel 3 initial volume 2022-12-25 14:14:27 -06:00
dannye 37a2367547 Unroll repts in tcg2 songs 2022-12-25 13:25:51 -06:00
dannye fc07fb1f9b Rename tcg extension macros 2022-12-25 13:19:49 -06:00
dannye 1115a3fe6c Unroll repts in tcg songs 2022-12-25 13:12:32 -06:00
MementoMartha ba8ca1e80a Update mr.rimeb.png
Should hopefully fix an issue that happened sometimes with building the hack
2022-12-25 16:30:36 +00:00
May Evans cef7b12780 add old rod reference
seemed funny in my head, also indirectly references magikarp jump if you look REEEEEEALLY into it
2022-12-24 23:14:45 +00:00
May Evans b903979237 update fighting dojo trainer
he now has sirfetch'd
added giovanni note for when we finish lavender tower
2022-12-24 22:58:42 +00:00
MementoMartha 2fc1f2250b A Christmas miracle! Martha got something done!
(and by that, she added Perrserker, Sirfetch'd, Mr. Rime and the Galar Birds, plus some team scaling and updated sprites for Politoed and Annihilape.)
2022-12-24 22:37:39 +00:00
May Evans 02fe134613 Update parties.asm 2022-12-19 05:56:20 +00:00
May Evans 0a1075f66a Add items to Mt Moon Crater
Adds fossils, Black Augurite, and a few other neat items to Mt. Moon Crater, given it's where the "ancient" Paradox Pokemon are. Seemed cool to me. Also does a few misc things
2022-12-18 05:56:07 +00:00
May Evans 597dc62f2e Give Paradox Pokemon the unused growth rates
It seems incredibly funny in my mind and does help close the in-game gap between them; Scream Tail got the very short end of the stick...
2022-12-18 05:00:15 +00:00
May Evans 5e4fb4af38 Readme facelift, evo condition changes
I gave the readme a facelift to show what's what, and also added notes on the new evolution conditions.

Some notes on evo condition changes;
- Set Sirfetch'd to be a Heart Stone evolution, seems fitting.
- Reverted Pikachu back to stone -> trade, as this is the most consistent with what people will rationally do. People **will** try to trade for Gorochu according to the mythos behind the whole thing, there's really not much wiggle-room.
- Swapped the Vileplume and Bellossom to match SW97 and base Vileplume, it's just confusing to veterans otherwise.

Things to consider:
- Making the Porygons consistent, right now they just aren't. Either add the Up-Grade or make Porygon2 trade as well.
- Adding the Politoed evolution to Poliwag as well to match early material that implied such.
2022-12-17 22:10:45 +00:00
May Evans f4f2628f8d Gym scaling base
This adds gym scaling for every leader, plus Koichi of the Fighting Dojo.

Me and Ema decided to give Koichi scaling, as he is a gym leader in everything but class. I will likely give Yujirou the same treatment once he's all set up.

The parties have not been set up, assuming Martha is working on them.

An important note: space is somewhat limited on trainers now, so the leaders will need implementing incrementally. You will most likely have to remove unnecessary trainers to make this work.
2022-12-17 20:47:39 +00:00
May Evans 25b61f95be Update README.md 2022-12-17 19:00:31 +00:00
May Evans 75b59760df Corrected gym scaling for Brock
Thanks to Chatot4444!
2022-12-17 19:00:21 +00:00
May Evans f582550f55 Add Gym Scaling for Brock
This code has been tested on 8 Badges and loads the rematch team, which implies it works correctly. It needs to be tested with progression and the like, though.

I've also renamed the "Pocket Lapras" a la the "Miraidon's Poke Ball" concept from SV, which can be used later.
2022-12-17 06:41:38 +00:00
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 2379dac1c3 Update README.md 2022-12-12 05:32:19 +00:00
May Evans b9ddd55ecc Update README.md 2022-12-12 05:31:28 +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 17d12a0413 Faster health bar
A simple 1-character change that does so much. Usually, the game delays it by 2 frames per pixel, so changing it to 1 doubles the speed. If it remains too slow, I believe it can be removed entirely, but I'm avoiding it in case of bugs.

I also changed the debug Pokemon to Croakozuna as Pound is s/e vs Dark, allowing for an easier visual. Rhydon changed to Rhyperior for the same reason; more damage, better visual.
2022-12-08 16:11:29 +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