Commit graph

2958 commits

Author SHA1 Message Date
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 59d5be61be stupid giovanni fix
i dont know why
i dont want to know why
but this is needed to make giovanni work properly
there is no excuse for this terribleness
but please accept it
2023-04-15 19:58:15 +01:00
Llinos Evans aa7487aa10 Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack 2023-04-15 19:50:58 +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 fdb5b8f860 commit 2023-04-15 20:50:07 +02:00
Capucine Meyer 23cbfaa819 omega disappears and loads giovanni 2023-04-15 20:36:36 +02: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 bb65963836 reworked disobedience, also new Tsubomitto sprite
turns out the last time we tried removing disobedience, pokemon wouldn't attack. also reworked the texts to remove references to it, as well as some SS Anne stuff
2023-04-12 12:03:40 +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
Llinos Evans 3c9e343f99 Update mon_icons.asm 2023-04-09 20:48:47 +01:00
MementoMartha c7499a1fd2 Removing MissingNo to make room 2023-04-09 20:41:31 +01:00
Llinos Evans fb3a20a51d No checking for disobedience!
This mechanic is rly unbased
2023-04-09 19:59:31 +01:00
Llinos Evans 9549675600 Removed boosted exp text
It's not boosting anymore, so it shouldn't be calling unnecessary scripts to spit out misleading text either.
2023-04-09 19:49:22 +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 56793e1d11 Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack 2023-04-09 16:56:39 +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 7c6ccdde26 label trade dialogue for future ref 2023-04-09 16:41:55 +01:00
MementoMartha bbec5a4256 Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack 2023-04-09 15:02:13 +01:00
MementoMartha eda2d0db01 Sprites for the final regional forms
(also some updated sprites for Gapdos and Goltres. Gonna finish these up soon)
2023-04-09 15:02:04 +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
Capucine Meyer 9bf8886d4b Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack 2023-04-09 14:43:53 +02:00
Capucine Meyer 8cf1ba9fc9 seems to have fixed the yujirou gym fight, now need to solve the warp issue once exiting the gym 2023-04-09 14:43:18 +02: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 374756eec6 Let Traded Pokemon be nicknamed
This comments out the script that makes the Name Rater check the trainer OT before giving his "rating". Therefore, traded Pokemon, including regional ones, can now be nicknamed.
2023-04-09 11:36:17 +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
MementoMartha 24602dc972 Adding a few new regional form sprites
Also fixed an issue with the giant rat. He clearly makes all the rules.
2023-04-08 00:23:55 +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
Llinos Evans ef785838ea Minor map tweaks
- Cut is no longer needed to access Celadon Gym
- Viridian Pre-Gym sign removed (no event assigned, replaced with cute tiles)
2023-04-05 15:55:35 +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