Commit graph

622 commits

Author SHA1 Message Date
Llinos Evans 6c9265f0a2 Elite Four + Champion refights
This was an interesting thought exercise.

As you can see, this code adds a scaling function for when you reach the KEP post-game. These teams are very powerful and a strong test of the player's skills.

I did, however, remove the Legendary Pokemon from the first three's teams. They felt a little bit out there and kind of decrease the significance of the player's. Plus, we just went through hell adding conditional Hall of Fame respawns.

The Elite Four use refight text based on their LGPE appearances. It's honestly a little odd, so if it's too much, the FRLG conditional text could be used instead. I like the way Agatha's plays out, though...

Anyway, stupid hacky implementation done, please don't look at how I did the champion's trainer number.
2023-07-09 22:16:09 +01:00
Llinos Evans 0659fb1c65 Finishing Silph Co. 11F
That's a fair chunk out of my day...

This commit finishes everything about Silph Co. 11F. DON'T. TOUCH IT. Unless there's a bug, but OTHERWISE, do NOT touch it. Holy shit.

Here's everything featured;
- Jessie and James fight, ported over.
- Rocket grunt changed to the appointment one from the strange room on the other side that really shouldn't be there tbh
- Omega fight now doesn't have the "watch out" text as I needed to do a micro-optimisation TRUST ME it was NECESSARY (it was not, in fact, necessary)
- Giovanni now reuses Beedrill and has a generally stronger team, scaling with the fifth Rival fight.
- Omega refight has been added after some toiling with the Team Rocket intro text that absolutely should not have happened but did for some reason AAA
- Rocket trio text somewhat tweaked

Oh and I ported over the balance patch on the stats, including some neo-Cryithan onboarding.
2023-07-09 11:43:32 +01:00
Llinos Evans 024da50117
Merge pull request #15 from PlagueVonKarma/postgame-legendary-setup
Postgame legendary setup
2023-07-08 16:04:25 +01:00
Llinos Evans f4eccdb77e Update IndigoPlateauLobby.asm 2023-07-08 16:03:50 +01:00
Llinos Evans 8a87ce000e Bug Fixes
Fixes the following bugs:
- Restores the Museum Guy's functionality that was removed when trying to allow Brock skip. Now works fine.
- Attempt to fix Yujirou's Sabrina-like glitch. If this doesn't fix it, look at Sabrina between RB and Y
- Attempt to fix some Misty text.
- Changed Squirtle check to use EVENT_BEAT_SURGE over the ThunderBadge. Same effect, saves a line of code, generally easier.
- Reverts a really old and shoddy DV generation system back to vanilla.

Also, I changed some gym/rival teams to reflect new philosophies from Discord discussion.
2023-07-08 10:01:27 +01:00
Llinos Evans f9f5a7f1b0 Groundwork
The script currently doesn't work how I want it to, and I don't know why.
2023-07-06 16:02:58 +01:00
Llinos Evans 9528f45ce2 minor bits and pieces
- Tweaked debug team for easier testing of actual trainers
- Hopefully(?) fixed nasty plot anim
2023-07-06 16:02:31 +01:00
Llinos Evans ab72fa0e51 Trainer variety enhancements
- Toned down a significant amount of "repeats"; times where you repeatedly fight the same Pokemon or an evolution line.
- Integrated beta Pokemon more.
- Also, imported the LGPE retranslation of Bill. In Japanese, he isn't a PokeManiac, but a "Pokemon fanatic".
2023-07-05 20:03:31 +01:00
Llinos Evans 6ba59391c1 Post-Playtest Bug Fixes
- Finishes the Vermilion Beauty event. One silly mistake involving the choice was fixed, and a workaround for wBeautyChoice failing in strange places implemented. Functionally the result I wanted.
- Implemented the Yellow spriteset for Vermilion City with minor adaptations. Fixes that funny issue I found on stream.
- Viridian Pre-Gym was fixed, reworking some events.
2023-07-05 17:59:21 +01:00
Martha Schilling baa94d76ae Functioning Galarian Moltres
- Moltres now functions correctly, seeing you like a normal trainer would.

- Slightly tidied up Brunswick Trail and Celeste Hill Outside's maps

- Celeste Hill Outside and Cave now play Digda01 as a music track
2023-07-04 12:59:54 +01:00
Martha Schilling 6a03f31b66 Now builds debug and non-debug rom files
Also fixes a bug I introduced a while ago where I accidentally added an extra sign into Fuchsia City. Oops.
2023-07-03 23:11:04 +01:00
Llinos Evans ee001744dc Fix Galarian Articuno
Very simple, very embarrassing glitch. One bird to go.
2023-07-03 17:29:21 +01:00
emaskyesmogon 4ca73c9dfd Merge branch 'master' of https://github.com/plaguevonkarma/kep-hack 2023-07-03 09:37:05 -06:00
emaskyesmogon d193a3dc14 Silph Co rerouting
This condenses Silph Co A LOT to make it easier to navigate. All warps have been tested.
2023-07-03 09:37:00 -06:00
Llinos Evans 0aab4fb5e8 Mystery Box bugfixes and improvements
- Meltan is now loaded in engine/battle/wild_encounters.asm, allowing its level to be fixed at 5 and avoiding various glitches. This also fixed the "running from Meltan ends the Mystery Box game" bug.
- Candy Jar now gives a message when it's full, more transparent to the player.
- Fixed a bug where the increment text wouldn't load properly, it was very silly.
2023-07-03 15:41:31 +01:00
Llinos Evans 3866a69a25 Vermilion Officer Jenny, other things
- Adds Officer Jenny from Yellow to Vermilion City. Due to spriteset restrictions, Roingus Girl has been removed; the self-insert felt a little weird anyway.
- Fuchsia City's map has been redone a little bit to more closely resemble the LGPE version, being far more walkable and aesthetically appealing.
- A Firefighter has been added to Cerulean Gym!
2023-06-30 21:51:05 +01:00
Martha Schilling 97a99c3744 Fixing Rod House map error
For some reason the Daycare and the Super Rod house use the exact same map interior pointers? This commit uncouples them so edits can be made to the Daycare while leaving that house unaltered.

(also have some small text fixes I made ages ago and never pushed lol)
2023-06-30 14:51:46 +01:00
Llinos Evans a3c81c549c Charmander & Rod House move
This adds Damien, the Charmander trainer, with text changed to be more accurate to his character.

I've also moved the Pewter Rod House nearby, as it makes more sense for it to be in the Water-type area. However, it seems to load oddly.

I have also integrated the Pikachu/Eevee Mode more, with architecture that it can make it more easily modified. This'll come into play for the Squirtle event.

I have also erased further misinformation the game gives about burns, and changed the Viridian Pre-Gym accordingly, to talk about confusion, which lacks a Trainer Tips sign.
2023-06-28 16:31:14 +01:00
Llinos Evans c716be39da Daycare Revamp (except Bulbasaur)
In the name of making Pikachu/Eevee mode more accurate to Yellow, the starter trio are being made obtainable. However, I am also improving it in some respects to make it more accurate.

In the anime, the Hidden Village is between Cerulean and Vermillion, so Yellow's implementation is inaccurate. It also pushes the Jynx trader out of the house, which is undesirable.

Thus, Melanie has been placed in the Day Care to give more reason to go there, as well as make the Day Care look more like the one from FireRed and LeafGreen. In the name of this, a PC has been added as well, allowing for easier utility around the Day Care itself.

Bulbasaur is currently allergic to hiding for some reason but we'll figure that out later.
2023-06-28 01:04:09 +01:00
Llinos Evans 83483f035b The Great Constant Compression of June 2023
This is a large-scale compression of KEP's current hide/show constants. RBY's works extremely oddly and is limited to 256 entries.

The problem with how RBY's hide/show stuff works, is that even though there are tons of unused constants, you...can't actually remove them. The constant list is tied to the hide/show data entries, so if you replace it with something else, well, now you just have two objects tied to the same constant. If you made the Route 2 item a boss, and someone picked up the item on Route 2, the boss would also disappear, and vice versa. So, we have to get creative.

I have reduced what we have to 248, but I think I miscounted when doing the funny list somewhere in the actual list when making sure the hex stuff is ok. Either that, or there's an error somewhere that Martha will, by some obscene miracle of humanity, discover. Anyway, this was achieved by turning multiple current overworld items into hidden ones, keeping them in the game whilst keeping to that all-important limit.

I also removed the items in Pokemon Tower 4F for this, just needed a little boost. Well, as you can see by the number, I technically didn't, I just miscounted like 20 times. Look, it's 10:11 PM, my stomach is in pain from an insane injection, and I don't even know if that map will come back, cut me some slack. Or add it back. You definitely can.
2023-06-27 22:17:07 +01:00
Llinos Evans 262c862a76 Fighting Dojo script revamp
This restructures the Fighting Dojo to match the new map, as well as add a few more features and safety mechanisms.
- Koichi, the Karate Master, now plays the Gym Leader theme when fought.
- Hitmontop is now an optional reward.
- Post-Game Rematch is available in addition to the gym scaling to be consistent with other Gym Leaders.
- A safety lock is on the Poke Balls prior to defeating the Karate Master, as the new structure now demands it. Indeed, this is why the reward area in vanilla is like that.
- Architecturally, there is now only one EVENT_GOT_HITMON constant, which is all that was actually needed in the vanilla game. Extreme microoptimisation, as event constants appear to be 16-bit.
2023-06-27 21:09:38 +01:00
Llinos Evans 18dd9715d0 Fighting Dojo Map changes
Needs Hitmontop placed in the middle
2023-06-27 14:00:39 +01:00
Llinos Evans 27cc616c0d Fix "Oak's Last Pokemon" line
Done by refactoring the Fighting Dojo greed line.

Also shifted some wild levels for extra variance.
2023-06-27 13:42:48 +01:00
Llinos Evans 9a24ec74d8 Vermilion Beauty Bug Fixes & more
- Vermilion Beauty no longer skips text to hand you your Pokemon
- Vermilion City text boxes are fixed
- Cancelling TMs and causing crashes when trying different ones is fixed (thanks to some old code by BlueZangoose, it was a vanilla bug!)
- Minor enhancement to the Candy Jar that seems to make Meltan more stable.
- Fixed a fallthrough error that caused Mewtwo's theme to play for every wild encounter (very cool, but also oops)
2023-06-22 18:54:25 +01:00
Llinos Evans c445892d7f S.S. Anne healer and other bits
This adds the S.S. Anne healer from FRLG that's notorious for gaslighting newer players who just think she's there.

This also adds an extremely early Mewtwo theme. It's far from finished, just happens to be in this commit as I was testing it in debug - thanks to Luci for working on this!

Updated bug list as well with things my friend Crunter found.
2023-06-21 21:06:08 +01:00
Llinos Evans beab109a16 Some work on GMolt fight
Currently, the movement is buggy and the battle repeats. It works without the movement, though...

Alternatively, give Galarian Moltres trainer sight.
2023-06-20 17:29:42 +01:00
Llinos Evans 8979403c5d Groundwork for Galarcuno in Garnet Cavern
This sets up most of the content necessary for Galarian Articuno's event. In SwSh, it has 2 copies, so I'm doing that here too.

Right now, the fight doesn't work properly and the copies don't hide properly. Otherwise, it's roughly how we want it to be.
2023-06-18 17:18:38 +01:00
Llinos Evans f1c8a3bdbb gzap minor tweaks
Moved gzap near the start to begin the quest.

Fixed a text issue where it should have been "done". Saves an A press.
2023-06-18 10:09:39 +01:00
Llinos Evans c356ee81f5 Saffron Guards are now British
They desire the caffeine...

Mt. Moon Square no longer breaks game balance.
2023-06-18 09:12:42 +01:00
emaskyesmogon 15be9046a7 Mt. Moon Crater Guard
Guard is implemented.
2023-06-17 17:07:54 -06:00
Martha Schilling f9d6534bcf BIG changes to postgame island
- Properly adds Brunswick Grotto, as well as Celeste Hill Outside and Celeste Hill Cave
- Citrine City received a minor redesign, putting the path to Brunswick Trail more to the west
- Added complete event for Galarian Zapdos as well as an encounterable, but unfinished Galarian Moltres, so all 3 birds can currently be caught
2023-06-17 20:36:01 +01:00
Llinos Evans 5279e8a06e Establish Brunswick Grotto
The warp at the moment is an absolute travesty, something on that tileset needs to change. Either that or we figure out something else.

Everything in the Grotto is done, except for making Galarian Zapdos disappear after being defeated. At least, to my knowledge...

Pokemon Tower 3F is dead until future notice - Martha said she wanted to compress the Diglett's Cave maps, though.
2023-06-17 07:56:30 +01:00
Llinos Evans 86230c64f1 New Citrine map architecture, Kinchou01
This adds all the required architecture for the new maps to work, as well as Kinchou01 to play when in Celeste Hill itself.

This doesn't add the events, though.
2023-06-14 22:49:03 +01:00
Llinos Evans 3b678b7fd3 improved 1/256 text
got a few suggestions and this tracks better, doesn't look as awkward. text limit really twisting my arm here.
2023-06-12 15:06:28 +01:00
Llinos Evans 62059aafd5 Bug fixes
- Fixes a bug where the Game Corner poster would pretend to be an Arbok. Very effective disguise.
- Fixes some text in Celadon University that would simply look odd. I need to use hyphens more, the rest of the game does it!
- Decapitalised the "normal-type" in Viridian Pre-Gym to match the rest of the game.
- Changed some SFX cues to use the level-up sound, but it's clearly crysaudio that causes this. Will talk with Dannye.
2023-06-12 12:48:08 +01:00
Martha Schilling c939b46740 Custom palette for Game Corner, slight early game rebalance
I did these a few days ago and forgot to push the commit lol

- Gives the Game Corner and the prize building a new palette

- Makes encounter levels a bit more consistent in the early game, as well as spreading out species a bit more evenly
2023-06-09 14:58:59 +01:00
Llinos Evans 749abc67b7 Gym Leader Rematches!
This commit adds a large fundamental change to KEP, that being Gym Rematches.

This is achieved alongside a rework to the script that makes those post-game-gating NPCs shift around. If you add a new one, just add its constant to the lists you'll see in the Hall of Fame script.

It also fixes a few bugs:
- Fixed a bug where Cinnabar Gym loaded a fleet of Blaines. This occurred due to the way he is coded at base, and a misunderstanding I had when implementing his scaling. This is now fixed by standardising his gym script instead, while letting the gym trainers still use the old one.
- Fixed a bug where the Up-Grade NPC would not appear after beating Silph Co. 11F. However, Giovanni currently seems to have trouble with his text. This floor needs some re-coding anyway, given we need to add Jessie and James to it.

And some misc. changes:
- Changed the first Moon Stone in Mt. Moon to a Poison Stone for the Nidoking speedrunners
- Debug Mode now has a line of code to set up the post-game easily
- Changed Surge's initial battle text to Yellow's
- Added Sabrina's more accurate LGPE initial battle text, referring to the spoon she bent by accident
2023-06-09 11:17:31 +01:00
Martha Schilling 5f8250f0d1
Update dex_text.asm
Fixed one minor consistency error with how these entries tend to be written.
2023-06-09 09:48:20 +01:00
Llinos Evans 35851ef6a9 LGPE Beauty Event
This is basically done, but has a few glitches to iron out that I don't have time to do today. So, I'm sending this in as-is with the intent to finish (or someone else can idc) it later.

I initially thought to restrict this to after Vermilion Gym but Persian is really bad and Arcanine doesn't compare to the L30 Dugtrio, so I think it's ok. Just barely balances itself out.

Bugs:
- GiveMonName doesn't work properly for the Vermilion Beauty after receiving the Pokemon, jank ensues.
- Text scrolls immediately when receiving the Pokemon from the Vermilion Beauty.
2023-06-07 11:17:47 +01:00
Llinos Evans 14c92ac855 Mt Moon Rocket has Raticate again, Arbok in Game Corner
Minor upgrades in accordance with the recent KEP playtest.

The Mt. Moon Rocket with the Raticate is arguably one of the most iconic NPC trainers in Pokemon history and under no circumstances should it be cut. No matter what Yellow tells you.

Added a nice Arbok NPC to the Game Corner to make more use of the new overworld sprites I did. It's basically a guard for the attendant to its left - need some safety in casinos, y'know? Especially pachinko parlours...

I put the Arbok text in `text_2.asm` since it'll likely be used by other maps down the line. Or not, but it's good for architecture.
2023-06-05 13:00:20 +01:00
Martha Schilling 3f2a065992
Update Route22.asm
Removing Mikon to make the spawns less cluttered, and making NidoF and Mankey more common.
2023-06-05 10:53:14 +01:00
Llinos Evans 1a68db3227 Post-Playtest Hotfixes
- Eevee and Pikachu family's growth rates are changed to Medium Slow. This gives them a much better early-game power spike that tapers off momentarily. They will level up faster until Level 68.
- Yujirou's levels and one pre-gym trainer are slightly nerfed, being easier for players starting out.
- Caterpie and Weedle in Viridian Forest have level deviation, and Pikachu is tapped on the wrist to not make the starter too redundant; change here is pending.
- Debug uses Pikachu and Eevee starters for future starter-based testing.
2023-06-05 02:17:54 +01:00
Llinos Evans 52874d515c Mt Moon hotfix
If you went into Mt Moon Square, it'd occupy `LAST_MAP`, so the exits needed changing.
2023-06-05 01:45:09 +01:00
Llinos Evans d10bbb5ba6 minor things for testing celeste hill
trying to debug this. made the warp better and moved cuno's cry. fixed some minor shitty code too.
2023-06-04 11:50:43 +01:00
Llinos Evans 0aa26308f2 Bug fix, ball miss text enhancements
This fixes a bug where Meltans would invade Trainer Battles under the effects of the Mystery Box.

I also did some minor groundwork where the Candy Jar check is a function. I intend to change it so that catching a Pokemon would incur it too. I ended up with glitches when doing that, though.

The "ball miss" message is now modular, with a new message being spat out when not in the Safari Zone. The message talks about it being "too strong" and "breaking the ball", making it far more intense and matching some early anime scenes.
2023-06-04 10:52:00 +01:00
Martha Schilling d07897bb4f Another few small dex entry changes 2023-06-04 08:56:29 +01:00
Martha Schilling 2738675599
oops
Farfetch’d only has one leek, Martha.
2023-06-04 00:57:21 +01:00
Martha Schilling 7d5fb8b031
Update dex_text.asm
Fixing a couple mistakes before I forget lol
2023-06-04 00:56:07 +01:00
Martha Schilling be610a2c39 Big Pokedex entry reworks
After going through the 1996 Pokedex again, as well as FireRed's dex entries, I've updated the majority of dex entries to add more information, be more consistent, or just slightly reword them to make them sound better. Some could still probably be reworked, but I'm mostly satisfied with these now.
2023-06-04 00:17:05 +01:00
Llinos Evans 01737d7b77 Candy Jar in Indigo Plateau, plus improvements!
The Candy Jar is now obtainable in the Indigo Plateau, instead of being an item obtained from Chief. I've removed most Chief-related stuff but expect some instability after you beat him, as I don't believe I completely removed the function to call the text.

The Candy Jar will now not collect candies in the following instances;
- It isn't in the bag.
- The total would go over 40.
Just makes sense and ensures players are engaging with the proper intentions. The 40 total is necessary, as over 40 stops the jar from working. This does mean some candies are "lost", but the players see that.

There's a bug where Meltan will have the moves of the Pokemon it's replacing and I don't know why. I've tried a bunch of fixes in `LoadEnemyMonData` but it didn't seem to want to work.
2023-06-01 18:40:32 +01:00