Commit graph

484 commits

Author SHA1 Message Date
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