Commit graph

192 commits

Author SHA1 Message Date
Llinos Evans c4afafb9ac Groundwork
Letter is there, post-game warp is done, new post-game event where you receive the letter isn't working properly
2023-07-12 17:44:25 +01:00
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 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
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 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 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 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 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
Martha Schilling 8045451b78
Update SafariZoneWestRestHouse.asm
NPC no longer spitting lies.
2023-06-14 09:11:37 +01:00
Llinos Evans 7ed5c0ae95 1/256 Text and other transparency enhancements
- In the event of a 1/256 miss, the game will now state the Pokemon evaded the attack to signify its occurrence. This is part of an effort to make misses, overall, more transparent.
- Battle Debug now loads some items to assist with testing.
- Misleading Guard Spec message in Celadon has been changed to refer to X Special, which it was actually describing.
- Removed "it can spook the target sometimes" text when getting the TM for Rock Slide, because it's a LIE
2023-06-12 14:41:13 +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
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
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 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
Llinos Evans 934f8adcac Mystery Box functionality
It was a long shot, but I did it! I added the Mystery Box from Pokemon GO! Very happy with the results here.

So here's how it works: When used, the game will replace Pokemon encountered with Meltan until the player leaves the map. This is sort of how it works in GO, with the player unable to close it and naturally petering out as they play.

Now multiple Meltan can be obtained, and in abundance, just like GO. Technically, someone could use this as a pseudo-Repel to replace hard encounters with easy ones.

Oh, and I'm pretty sure this happens vs static encounters as well, but it's awkward to account for I think that's hilarious, so...
2023-05-31 05:03:22 +01:00
MementoMartha b70e7b5fb5 A few updates
- Changes Bill's Garden to be a more fitting Overworld-tileset map

- Gives Cinnabar Volcano a unique palette, being a slightly less-bright version of the RedMon palette

- A few small changes/improvements to the Rival teams

- Reduced wild encounter levels in Silph Gauntlet a little

- Adds a 100% chance for a Magmar encounter when fishing in the Cinnabar Volcano lava

- Hides more 'secret' areas off the Pokedex area listing, namely Mt. Moon Crater and Faraway Island

- Improves Jabetta's sprite a little
2023-05-19 16:17:44 +01:00
Llinos Evans 9a88543f19 Tweaks
Fixed the Rock issue (thanks frrfy)
Changed the Slowbro text to reference a move it actually learns
2023-05-19 15:48:02 +01:00
Martha Schilling dc439c36cf
Update CeruleanCity.asm
god why do I always find something worth changing immediately after the previous commit
2023-05-19 10:16:34 +01:00
Martha Schilling f881c345c7
Update CeruleanCity.asm
oops the sign outside needs changing too
2023-05-19 10:12:55 +01:00
Martha Schilling 5908a8c082
Update BikeShop.asm
So...for some reason they never bothered to localise the cool name for the bike shop in Cerulean. I wanted to restore it.
2023-05-19 10:08:17 +01:00
Llinos Evans 7fec4d9357 Lots of small tweaks
- Gave nicknames to the Galar Evolution trades, they're a bit different to regional variants n such
- The Throw Rock command now only increases flee chance by 50%. It seems like it may be a little TOO strong though, bit curious.
- Changed a bit of text here and there
- Made CHIKUCHIKU trade accessible, still need MICHELLE
2023-05-19 03:21:00 +01:00
Llinos Evans 253f8f4a22 FRLG Move Tutors
Still need to find out what I want to do with Body Slam, Swords Dance, and Thunder Wave. Slam/SD are on the Sevii Islands, and TWave is on an existing NPC who usually gives Self-Destruct.

Could possibly refactor the item receiving text.
2023-05-18 18:06:44 +01:00
Llinos Evans 0668db0ef0 Mt Moon Square House
This adds the Mt Moon Square House, faithfully recreated from GSC. I haven't yet sorted out the important details regarding the Crater Guard and such, though.

Making the map involved making a new desk tile and making house tile $36 be considered a counter tile. Hopefully there aren't any adverse consequences but I've never seen anything of that nature.

I noticed there are a ton of Clefairy text bits, so I refactored it to be a single line farcalled from `text_7.asm`. This also involved an interesting thing with the Pokemon Fan Club where the Pikachu fan has a Clefairy, so I fixed that too.

I figured that adding the dance was a little difficult right now, so we have Clefairys walking around instead.

I haven't figured out a good place to add the ladders yet (since there should be two entrances) but we'll figure that out eventually. It's plausible that we just make the Crater the southern warp, but I like how out-of-the-way the current one is.

Oh, and I fixed the Crater warps.

Overall, functional, but not finished.
2023-05-18 16:08:42 +01:00
Llinos Evans 3894953698
Merge pull request #13 from PlagueVonKarma/BattleTentPort
Battle Tent Port
2023-05-14 20:39:13 +01:00
Llinos Evans 211e92ddeb bits and bobs
fixes an issue viwalls pointed out and tweaks chief's monologue
2023-05-14 08:59:12 +01:00
Llinos Evans e02a4b54ef Update CitrineCity.asm 2023-05-13 20:27:36 +01:00
MementoMartha cdb00af812 A few minor changes
- Made Gym Leader levels more consistent

- Updated sprites, including a complete redo of Espeon's (based off the Gold sprite)

- Fixed an issue where Blue would have an incorrect team

- Changed Celadon Gym trainer text to accomodate for being a girl
2023-05-13 00:41:07 +01:00
Llinos Evans 3b16404a50 Populate Citrine City
This commit adds NPCs and signs to Citrine, doing some significant worldbuilding in the process. I considered adding an event where Oak greets you like how the Magma/Aqua Admins do on the ORAS Battle Resort, but it seemed a little too on-the-nose, y'know?

There was an issue where you wouldn't be walked out of doors automatically, which was quite immersion-breaking. That was because the door tile IDs weren't defined - this is fixed too.

Some map elements have been altered to facilitate the new changes, and obviously, some map sprite slots have been filled.

Importing and changing the Battle Tent is most likely my next task.
2023-05-12 22:30:51 +01:00
Llinos Evans 9bc7505195 Groundwork for James Bottle Caps
Currently, he doesn't deduct a Bottle Cap and he only fills out Attack and Defence. DVs are stored as a 16-bit address, so I need to find a way to make `a` work with it...
2023-05-11 08:43:19 +01:00
Llinos Evans bc0b7963ca also inconsequential 2023-05-06 09:16:09 +01:00
Llinos Evans 25cf5e4419 jessie/james text for mt moon
this has no consequences at the moment
2023-05-06 09:15:39 +01:00
Llinos Evans 06d2e7786e Backporting Tower Jessie & James
This saves a HS constant to boot, which is handy.
2023-05-06 08:16:20 +01:00
Llinos Evans 16e3c69ee8 Giovanni uses his unused theme, and more!
This update does a good few things. Giovanni now uses his unused encounter theme in all pre-fights, which is followed by the regular evil trainer theme when you're about to fight him. This feels very correct. His team has also been minorly altered.

I backported LGPE's pre-fight monologue for Giovanni in Rocket Hideout B4F. Adapted for RB's story, of course, no Cubones here. The original text is very awkward and abrupt, and it also makes the encounter theme feel much more effective in delivery. I think a lot of people can appreciate this.

I also backported Jessie and James for Rocket Hideout B4F while I was at it. I had to change their event script quite a bit for it to fit, and their walking seems...awkward. Regardless, it's functional. The rest will be done with time.

To make future dev door testing easier, I'm keeping all warps I've previously used in comments.
2023-05-05 04:48:58 +01:00
Llinos Evans abaff60797 Refactor Giovanni's Room, restore Rocket Hideout B1F
With the way KEP is shaping up, the Rocket Hideout can easily stay with little issue. I don't expect it to be a problem at all. Therefore, in the interest of keeping Lavender Tower's progression the same, it's being restored. I do expect some Lavender Tower floors to be nommed, though.

I expect Silph to also be salvageable but I also really hate Silph.

Oh, also, the Game Corner guard has been buffed. He sucks. They call that a guard??
2023-05-02 02:48:41 +01:00
Llinos Evans 7200b1474a Groundwork for Vermilion Passes
The warps are currently broken for reasons I can't figure out for the life of me. Faraway Island works but is loaded in a glitched state where other warps break and are generally very unstable, while Citrine softlocks. It's progress, though.
2023-05-01 17:42:16 +01:00
MementoMartha 1dbe226f77 New Galarian Articuno Sprite, and new Cinnabar Volcano map
(also a few other fixes, but they're not as important)
2023-05-01 00:47:09 +01:00
Llinos Evans 084e03efa1 Warps, ArticunoG, refactored Garnet 2F
I messed up Garnet Cavern's 2F name for some reason

Also added all the warps which are, ironically, exactly the same as the international Cerulean Cave. Added the event for Galarian Articuno but gee I hope the constant skip doesn't cause any issues
2023-04-30 19:12:59 +01:00
Llinos Evans 4d40fe09f0 Groundwork for Garnet Cavern
Currently just uses the RG Unknown Dungeon map, which should be changed accordingly. The warps and stuff outside of basic entry aren't implemented.

Has a halved encounter rate compared to other maps, which matches the idea that caverns don't sustain much wildlife.

Mt Moon theme may not be used in the final product.
2023-04-30 17:06:44 +01:00
Llinos Evans 83f6200c74 New sprites just dropped
A selection of Game Corner sprites retooled to be overworld Pokemon. I also placed Voltorb, Diglett, and Magikarp.
2023-04-28 19:11:49 +01:00
Llinos Evans 583847ae2c Citrine Mart
This adds Citrine Mart, which is battle-centric. It sells all the "strongest" items and makes Max Revives renewable.

I made a specialised tileset for Citrine Mart, combining the old and new styles to make something that feels right.
2023-04-28 03:08:54 +01:00