Commit graph

425 commits

Author SHA1 Message Date
Thorn Avery 4ca5573837 fixed james bottle cap handling 2023-11-13 12:38:21 +11:00
Martha Schilling 9c35a2c12c oh my god why did i forget to push this
- Added LuciShrimp's amazing demake of the Area Zero theme! Plays in Mt. Moon Crater.

- Lickilicky now has access to Explosion and Selfdestruct.

- Sirfetch'd forgot how to Fly.

- Steelix is now even more susceptible to getting BubbleBeamed to death since it now has 10 less base Special.

- Small changes to a handful of trainer parties.

- Changed some encounter tables, mainly making Ramoose more scarce and Tangela more common.

- Blissey, Magmortar and Rhyperior all receieved updated sprites by Albatross!

- Jynx also receieved an updated sprite, giving it the purple skin it has in later generations.

- Minor level changes.

- Updated README.
2023-11-03 13:20:31 +00:00
Llinos Evans 6debaf165b Fix Gym Rematch quotes
Thanks to Rainbow Metal Pigeon for spotting this!
2023-10-15 11:17:47 +01:00
Llinos Evans da433c6758
Merge pull request #18 from thornAvery/master
Tradeback Tutor Textspeed Troubles
2023-09-25 03:01:12 +01:00
Llinos Evans 47a144d99e Text speed fix
Thanks to thornAvery for diagnosing why this happened!

Quick test says this works fine and without consequence.
2023-09-25 03:01:01 +01:00
Thorn Avery 0adce2c33e fix tradeback tutor text speed issue 2023-09-25 11:42:31 +10:00
Llinos Evans 63a28e410c Celeste Hill Gate & other things
- New Celeste Hill Gate location so the entrance into the location makes more sense. Also took the opportunity to include more lore. This replaces Pokemon Tower 4F.
- Fixed a bug that caused the Cat icon to not animate correctly.
- Made the infinite Nugget glitch work properly because I was stupid and didn't test it.
- Luxwan now uses the Small Bird icon to fit with the rest of the line.
- Nidoreign has a new Pokedex entry and classification, centred on the Nido's origins in the Moon Rabbit of Asian mythology.
2023-09-20 17:02:09 +01:00
Llinos Evans 953e8e295f Post-stream bits and bobs
- Reused the double doors for the Route 2 gate, and added the warp for it
- Changed the Route 2 map to have the ledge on the path this irritated the fucking LIFE out of me
- Pokemon Tower takes you to the right place when going down.
- Kotora line now has Flash
- Refactored Gentlarva
- Route 2 gate now uses the double doors.
- New hidden Moon Stone where the Clefairy are in Mt. Moon
- Added a new Paradox Pokemon-themed border by Gecko557
- Shifted a ledge in Cerulean City that was off-centre in a really jarring way
- Added the Nugget glitch from FRLG because it's funny and cool
2023-09-20 08:17:34 +01:00
Llinos Evans ad4567e691 Fix Blue's movement when picking Bulbasaur
lol no one reported this for 8 months
2023-09-20 04:57:27 +01:00
Llinos Evans 847c52be9d 3DS idiot-proofing & other bits
This adds a makeshift border, which will later be replaced with a proper KEP one (thanks Gecko557) The readme also includes a link to the software itself.

Responding to some feedback on YouTube, the Citrine Mart now features PP Ups and Max Elixers as renewable items. PP Ups have never been renewable!

Oh, and the Exp. All is now a key item because for some reason it wasn't before. Yikes.

Last commit for the night.
2023-09-20 02:14:31 +01:00
Llinos Evans c0bf3ff49d Fix Giovanni's Room + bits and bobs
- Fixed the Arrow Tiles, it was very silly.
- Edited the text in Giovanni's Room to fix a gap, but also ended up adding citations and stuff to the file for the interested.
- Edited the map in Giovanni's Room to make a little more sense.
- Fixed some post-game Hall of Fame setup stuff.
- Edited Install.MD to be more idiot-proof
2023-09-20 01:24:35 +01:00
Martha Schilling 508a4e790e The Big One.
Whoa, this one's been in the making for a while now. This one has been my attempt to fix as much as I could within a little over a month. Here's what I've got for you.

- Fixed a bug in Silph Gauntlet where the trainers would not see you unless you spoke to them

- Removed the unnecessary Gawarhed and Wugtrio static encounters. In what was once Gawarhed's place is a Rare Candy.

- Implemented a working ferry system (huge thanks to Red++) that allows travelling to Faraway Island and Citrine City with the right tickets. Currently both maps use a copy of the SS Anne, which may be revised later.

- Bittybat, Magnetite and Burgela have been removed to fix a Pokedex bug where entries wouldn't display correctly if the total number wasn't a multiple of 8.

- Fixed a bug where fishing up a Wiglett and Wugtrio would play the trainer battle and Champion battle themes respectively

- Restructured the Pokedex a little. Don't worry, Lickitung's still number 108!

- All references to betamon in the disassembly have had their names updated to match the new Ogasawara ones

- Removed Blastyke as a Game Corner prize, replacing it with Squeamata.

- Garnet Cavern is now properly listed as a dungeon map

- Fixed an issue where trying to leave Bill's House after entering the garden would put you back in the garden

- Moved Silph Gauntlet's Beauty down 1 floor to make the number of trainers on each floor more consistent

- Finished Gauntlet 6F except for the trainer text (PvK please help)

- Gavillain's stats updated to match KEP 1.4 on the Showdown server. It's now a Dragon/Electric type with less Ice coverage.

- Fixed Clefable's and Wigglytuff's starting movesets from an earlier commit

- Fixed an ABSOLUTELY HORRIBLE, EGREGIOUSLY FRUSTRATING BUG that caused the Pokedex's seen counter to rarely update. This is what caused this commit to be delayed for so long. No joke.

- New sprites, courtesy of Albatross, for Sylveon's back sprite, Alolan Marowak, Alolan Muk, Galarian Weezing and Magnezone!

- Fixed a bug preventing the trade for Haunter from being accessed.
2023-09-19 23:34:25 +01:00
Llinos Evans 8bd3b8a703 Hall of Fame Crash Fix
I forgot to put a `ret` at the end of `ShowThis`, causing the sequence to break. It also fixes a bug that would trap you in your house if you cleared the game at all - LAST_MAP is set to the player's room due to how we changed the starting position.

The post-game Legendary respawns are NOT fixed with this, for reasons I don't yet know. It's most likely the faulty dex as a whole.

The post-game setup itself now works, though - Route 1 Oak appears, Crater Guard disappears, Bill's Garden becomes accessible, etc.

Cerulean Cave is made accessible through the post-game setup until the gauntlet is officially done.
2023-09-07 01:20:53 +01:00
Llinos Evans dadd7ee6a6 Bug Fixes & Enhancements
- Most, if not all, Silph Co. warps have been fixed. Inappropriate ones have been removed.
- The Metal Coat can now be found where one corrupted Silph Co. warp was to fill dead space, and another is in the Power Plant, replacing Carbos.
- Bill now trades you Hisuian Arcanine after being saved.
- Bill's Grandfather now trades you Hisuian Electrode. Had to remove Crinkles, but Tangela is literally right next to Cinnabar, c'mon lol
- Toedscool can now be found behind Pallet Town, replacing Gloom and Weepinbell, making it more focused.
- Now you can't run from Omega! May expand this to more Pokemon depending on feedback and whether it's ok on processing. Main concern is making the run button too laggy - it raised some eyebrows.
2023-09-02 19:33:14 +01:00
Llinos Evans 138bfd7042 Multiple bug fixes
* Moves the Mystery Box activation into Event Constants. This means that now, the Mystery Box activation is handled in the save, preventing some jank from happening when resetting.
* The "don't switch off the box yet" variable is now always unset after entering a map. Meltan itself allows the variable to keep being re-set, which is super handy. Now, whenever you enter and exit maps, it'll work properly.
* Flying, using an Escape Rope, and using Dig, all now unset the Mystery Box. If for some reason everything fucks up, this'll fix it.
* Fixed a text bug with the scientist in Celadon University.
* Fixed a menu alignment issue with the Vermilion Beauty.
* Attempted to fix the Battle Tent exit. Failed. This is a really, really bad bug, hopefully this gets sorted sometime.
2023-08-31 02:48:01 +01:00
Llinos Evans 72a372dcde Groundwork for new Vermilion Pass system
Alright so this is the start of producing a new and improved pass system - one that actually works.

Long story short: Now there are three dock entrances. One for the S.S. Anne, one for Citrine City, and one for Faraway Island. I don't like it, but the old system literally just would not work, and with the time span in mind, I just want to use this instead.

Here's how it works;
- Usual S.S. Anne trigger is used, but with a new coordinate range.
- When triggered, check the coordinates the player is in; if it's not the usual S.S. Anne one, they're getting kicked to a new script.
- Use that to flag the player as usual.

Glitches:
- Triggering these multiple times causes strange jank, including crashes. I have the player forced into the new maps for now, but even going back can cause issues. I don't understand it.
- Citrine City's warp just...doesn't work, presumably due to a warp limit. However, after chopping off the warps so there's one each, it still happens.

These glitches need fixing before KEP can launch.
2023-08-19 22:11:12 +01:00
Llinos Evans fe45fe99c1 Small bug fixes
- Oak no longer appears in the lab prematurely you can all stop reporting that now
- Added some text warning about only needing to do Hyper Training once. The function as-is is really weird to add a conditional to and I'm a bit too tired to pull it off.
2023-08-10 23:15:57 +01:00
Martha Schilling ecb6988ba5 August bug fixes: Part 1
Credit to ViWalls for discovering most of these bugs in his playtest:

- Citrine City's theme has been made slightly louder.

- The book in Mr. Fuji's house had difficulties working properly, so it's been removed for now.

- Fixed issues where Silph Co. and the Fishing Rod house displayed incorrectly on the Town Map.

- Removed the unnecessary sign outside Celadon University.

- Fixed an issue where 2 NPCs in Cinnabar Lab and Pokemon Mansion, respectively, had incorrect text.

- Fixed a text issue in Pokemon Mansion where the final Mewtwo log would display incorrectly.

- Altered a piece of text in the secret area of Pokemon Mansion to avoid a text box error since the idea we had in mind for it was scrapped.

- Fixed a text issue in Viridian Pre-Gym where the text for the right-side poster overflowed past the edge of the textbox.
2023-08-03 16:39:11 +01:00
Llinos Evans 2a4eaf0a87 Fuchsia Mart & Stone tweaks
Fuchsia Mart is now in its LGPE location. I moved the Ice, Poison, and Heart Stones here to reduce the power spike from Celadon City as well.
2023-08-03 01:10:07 +01:00
Martha Schilling 38b2b2c6c9 Updated Citrine theme, plus some text changes
Pushing a commit for the less important stuff while I finish the Silph Gauntlet's missing floors.

- Swaps the Biker and Psychic in Silph Gauntlet around

- Increased J&J's Meowth's level to make it less unbalanced in the later fights

- Text improvements for Citrine City, Saffron Gym, and Viridian PokeMart
2023-07-28 11:03:11 +01:00
Llinos Evans 47f2683d85 Finish Chief, bug fixes
This finishes Chief's event, with all the necessary components for the post-game Mewtwo fight sorted as well. I added an event the Master Ball sets for modular monologue text, for improved immersion.

I have also fixed some bugs;
- Fixed the oft-reported walking in trees bug in the Forest tileset.
- Fixed the Oak's lab computer issue by just...removing the computer. I made the map symmetrical instead, feels a lot better to look at, at least for me. I think it was meant to have an event on it or something, but I couldn't find anything, felt like I was being gaslit.
- Hopefully fixed the issue with the border blocks going weird after saving and resetting, by making the tileset directly point to the gym one, which Oak is meant to use. I am not sure how that glitch happened for ViWalls.
- Fixed the Viridian Pre-Gym text scrolling issue.

I still cannot replicate the crash bugs that some people have been experiencing and don't see anything that could be causing it.

I also changed Trampel in Victory Road to Steelix, as mentioned by Gogocrafter.
2023-07-27 14:39:24 +01:00
Llinos Evans 07a71f2ab3 Implementing post-stream bug fixes
This addresses some issues found during my last KEP stream.
- Take Down TM on Silph 5F to Earthquake, ensuring that TM does not go unused.
- Bill's Garden now features Lapras and has level deviation.
- Mt. Moon B1F's area where you access Mt. Moon Square now uses an upward-facing ladder, giving the illusion of going to a summit-like location. This makes its current odd location make more sense while not invalidating the progression regular Mt. Moon has.
- Melanie should now give Bulbasaur correctly.
- The Karate Master now has a failsafe for if you got a Hitmon, where he is guaranteed to not refight you before the post-game.
- Fixed a 17 error Old Dance Jacket reported with the Up-Grade NPC's text.
- Fixed nickname screen corruption when getting the Pikachu/Eevee mode starters.
- Fixed some curious warp issues with Lavender Tower by reversing 3F. Could use with some tinkering. Silph still needs fixes.

Credits have also been made more precise in the interests of better open source derivatives. Felt a bit odd expanding my credits so much, but this also made me realise I need to touch grass more frequently. I have also made our Open Source policy more precise.
2023-07-24 01:08:46 +01:00
Martha Schilling 1021bcd90a Update PokemonTower7F.asm
forgot to change another thing, sorry
2023-07-23 19:04:54 +01:00
Martha Schilling e0be9709e8 Update SilphCo11F.asm
lmao i didn't fix enough of the build issue
2023-07-23 18:32:29 +01:00
Martha Schilling 4d489e6530
Update SilphCo11F.asm
Hopefully fixes a build issue
2023-07-23 18:23:27 +01:00
Martha Schilling c5eff723b1 A couple of bug fixes
More still need to be done but I'm separating the commits so I don't get overwhelmed lol

- Fixes a bug with the Up-Grade NPC in Saffron. He now properly shows up only after defeating Giovanni.

- Fixes a bug where Silph could be entered before receiving the Poke Flute.

- Silph Gauntlet 5F has a complete remodel, more closely matching the original map found in the leaks.

- One of the Fuchsia Gym Trainers no longer uses a repeat Arbok.

- Wiglett and Wugtrio could learn Rock Slide via TM, which has now been fixed.

- Jacky uses a Porygon in place of Machop, as it ties into his polygonal, Virtua Fighter-inspired sprite.

- Chief uses a Gengar instead of Porygon2 to represent the Silph Scope.

- Omega's and Giovanni 2's levels have been toned down slightly.

- Lance now uses Crocky over Aerodactyl.

- Yujirou's non-initial teams have had their levels reduced to be the same level as the previously-fought Gym Leader, rather than the upcoming one.

- Updated README with additional credits.
2023-07-21 19:35:23 +01:00
Llinos Evans 8cd8f1ded0 Shinjuku Jack, final Mewtwo theme
This renovates the Celadon Mansion Roof House to feature a faithful restoration of Shinjuku Jack. Notes are in the script file.

Also, LuciShrimp's Mewtwo theme is finished!
2023-07-16 17:14:43 +01:00
Martha Schilling 91e06763dd Adding data for Silph Gauntlet Trainers (2, 3, 5F)
Adds the trainers themselves, dialogue still needs to be written but PvK can help with that

Currently they either don't see you or challenge you multiple times...probably issues with where the event constants are located, will sort out once I figure out the problem
2023-07-15 22:07:51 +01:00
Llinos Evans ffd03c1b06 Populating Brunswick Trail
This adds three trainers to Brunswick Trail, as well as the lover NPCs Martha wanted to write dialogue for (with placeholders for now).

Most trainers are merely commenting on the strong and energetic Pokemon, which I think matches the racing theme it has going on. This can be changed if need-be.

I have also removed all the noise on the Fake Tree sprite that got added when I imported the tile. Now, it's far more convincing.
2023-07-15 16:30:26 +01:00
Llinos Evans 1c1b3063bf Brunswick Glade
This adds the intermittent area before Brunswick Grotto, where you'll encounter Galarian Zapdos periodically.

It seems the hide/show constants are desynchronised again, as the copies in the glade won't disappear.
2023-07-14 13:49:36 +01:00
Llinos Evans 3ef4cea23d Fix crash when losing to Yujirou
The reason was because not all the infrastructure for an actual battle was set up - this fixes it. It still has some strange text that appears though.

Also did some minor optimisations on the Vermillion Dock stuff - I think the direction I am taking Faraway Island will work. However, something in that script causes any and all special warps to crash in some way. I am not sure what it is that does it.
2023-07-14 12:16:28 +01:00
Llinos Evans 9015062b0a fix rod house
i committed crimes no one ever should

this nukes silph co 8f from the game
2023-07-13 05:45:43 +01:00
Llinos Evans 3e542c959e Yujirou Enhancements
It felt weird that Koichi would have Gym Scaling, but Yujirou would not. So, I changed that to be a thing. I pegged his level scaling to Brock's, mainly because Normal-types are absolutely ballbustingly broken in this game and it makes sense from a progression standpoint. In doing that, I realised some variety in scaling (like, -1 +1, occasional 2 type stuff) could be interesting.

I also fixed multiple bugs;
- Gym Trainers correctly reset when you leave; no visible effect except to me debugging.
- Above also fixed Yujirou not having his loss sequence after, well, losing. Reported by shawesome.
- In fact, Yujirou will even display his loss text after losing, something I learned from doing Professor Oak's new Citrine Pass functionality.
2023-07-13 03:05:19 +01:00
Llinos Evans a13b1a0a47 Finish Post-Game Letter & Citrine Pass
This makes it so that once you clear the game, you will be able to get the Silph Letter from your mom, and the Citrine Pass by beating Professor Oak.

You'll now walk to your mother upon leaving your room post-clearing the game, and she'll hand you the letter. This'll basically explain your next quest to you.

The Professor Oak event kind of destroyed my sanity but that's fine. It works. Thanks to Martha for the idea.

Considerations for a full bag are done and they were annoying. I decided to show off and do some comedy to alleviate the lost sanity.
2023-07-13 02:11:45 +01:00
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
Martha Schilling 0852d5f725 A few bug fixes
- Fixed a bug where attempting to Fly on Celeste Hill caused a huge memory corruption effect. Oops.

- Fixed text issues on Route 1 and Museum 2F

- Tidied up trainer parties a little more
2023-07-12 14:16:41 +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 024da50117
Merge pull request #15 from PlagueVonKarma/postgame-legendary-setup
Postgame legendary setup
2023-07-08 16:04:25 +01:00
Llinos Evans 2b1b29a0c7 Update HallOfFame.asm 2023-07-08 16:02:27 +01:00
Llinos Evans 24a89f1fd7 this can be optimised too 2023-07-08 15:54:53 +01:00
Llinos Evans 2ca3ea175f extra optimisation 2023-07-08 15:54:06 +01:00
Llinos Evans 0c4d3c8731 Optimise hide/show 2023-07-08 15:52:31 +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 8e5f603a23 Gift Pokemon changes
The Gift Pokemon from vanilla now use the LGPE levels, which are all far more applicable for general use. With the Move Relearner's existence, it is unnecessary to hold back their levels anymore. This most notably means the Silph Co. Lapras is now Level 34, much more appropriate for general use.
2023-07-05 18:46: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