Commit graph

287 commits

Author SHA1 Message Date
Martha Schilling c5c521e48c Making Giovanni's Room better
I've been at this for like 2 hours, I don't care how scuffed this code is, I just wanted to make the entrance to Giovanni's room look smoother and less obvious-
2023-12-02 22:19:48 +00:00
Martha Schilling 19c4bec9ee this is a commit.
- Added another counter to the Game Corner prize room, adding Abra, Clefairy and Dratini back as prizes.

- Fixed Thorn Avery's and Zeta Null's names in the credits

- Small map changes to postgame areas

- Polished the new dex entries again

- Mewtwo no longer gets Waterfall and Roar from tradebacks

- Fixed a bug where you couldn't surf in the water on the Ferry tileset

- Gave Giovanni's room the same palette as Rocket HQ

- Minor text fixes

- Fixed an issue where LAST_MAP wouldn't update when sailing to Citrine
2023-12-02 16:02:40 +00:00
Martha Schilling 02e6aa7bb0 Updating the credits
Added a few more names from the README into the in-game credits, and used the original draft of the ending theme to extend the music.
2023-11-29 23:09:20 +00:00
Martha Schilling f6b1c94c0c progress is progress
Bug fixes and new sprites mostly, just trying to do what I can, when I can.
2023-11-28 12:33:01 +00:00
Llinos Evans 6504863b28 Seagallop Ferry Port
This adds a new tileset for the Seagallop Ferry. Had to remake the tileset from scratch using the S.S. Anne one. Very awkward!

The map could be made to look more like the FRLG one but that's neither here nor there.
2023-11-25 19:22:15 +00:00
Martha Schilling 1c07d4e59e GAY GYM
- Added the unused rainbow palette for Celadon Gym.

- Fixed Faraway Island using Vermilion's palette.

- Rocket Hideout now uses the same palette as the Game Corner

- Minor text fixes
2023-11-25 18:05:44 +00:00
Llinos Evans e6119651d8 Cinnabar Lab has a proper fossil machine now!
Taken from the RG prototype assets!
2023-11-25 13:08:49 +00:00
Llinos Evans 8d28a3ae0e Restore unreferenced Porygon PC
This was deleted when I was sprucing up the final Silph Co. floor, but I decided to restore it instead.

Because of the weird way PCs work, I made it so the text is a literal bg event on a monitor, true to the text. I think it works fine.

The text was changed to use `prompt` instead of `done` to fix text scrolling issues.
2023-11-25 12:36:10 +00:00
Martha Schilling d41d0e8e9a minor post-playtest fixes
- Moved one of the trainers in the Celadon Uni PokeCenter to stop him from being in the way of the nurse

- Buffed one of the Scientists in the Mansion

- Moved the nurse and Weezing trader on the SS Anne slightly

- Boosted Meltan's catch rate because having it be that low is ridiculous

- Increased Luxwan's height because real swans are not that small

- Changed a Cue Ball's party to allow his dialogue to make sense

- Wild level balancing around Vermilion City

- Fixed a small Pokedex display bug

- Text fixes
2023-11-25 08:48:01 +00:00
Martha Schilling 4384bc639d Improved Cinnabar Volcano + Mansion B2F!
- Cinnabar Volcano now requires Strength to complete, and contains several trainers, including 3 Firefighters.

- The entrance to Mansion B2F has been changed to a warp pad instead of a staircase.

- Removed the boulders in B2F to fix a bug and to prevent softlocks.

- Minor text fixes.
2023-11-24 11:36:14 +00:00
Martha Schilling 29fc579c3f Obtainable Safari Balls...?
Here's one for all the people that wanted another wacky interaction with the shady salesman!

He stands outside the Safari Zone selling his own Safari Balls. They act the same way, they're called the same thing, but they're looking a little off...hey, is that paint peeling off?

Anyway, this acts as a way to get Safari Balls outside of the Safari Zone, like in SwSh! Whether or not you wanna pretend that they're real, it's still neat that he's selling them to you for a good price.
2023-11-23 22:19:08 +00:00
Martha Schilling 013dc271fb why why why why why won't you work
I'm committing this for someone to have a look at my apparently-garbage code and figure out what I'm doing wrong because i CANNOT figure this out on my own
2023-11-23 19:18:00 +00:00
Martha Schilling 7c5c2a3047 mini update
- Tiles now animate correctly while still being sped up (credit to jojobear13!)

- Fixed issues with certain cave maps being glitched after importing the new tileset for Seafoam

- Gave Celeste Hill Cave the same palette as the exterior areas

- Fixed an inconsistency in Koga's pre-fight script
2023-11-22 12:25:46 +00:00
Martha Schilling ef62d0a43f would you believe me if i told you this still isnt done
in the middle of a breakdown here but i'm committing this because I don't wanna have an overwhelming number of changed files like the Big One

- Fixed a bug where an item couldn't be picked up in Mt. Moon Crater

- Gave new cries to Leafeon, Glaceon, Perrserker, Gentlarva, Carapthor, Gorotora, Magnezone, Tangrowth, Tricules, Magmortar and Meltan. Pupal and Lickilicky also got new cries but they'll probably be changed later

- Changed Citrine's map slightly for hopefully the final time, removing the tall grass to allow the Old Man Glitch to work there

- Brought Pokemon Tower 5F back for some reason

- Moved the Rocket Grunt on Silph 11F closer to the Omegadge door

- 'Fixed' a warp issue on Faraway Island, can definitely be improved though

- Gave Gapdos 10 more base special because i forgot the first time

- Fixed a typo in Hitmontop's dex entry

- Fixed some inconsistencies in Gao and Gorotora's movesets

- Added the unused ice tiles to Seafoam Islands and Garnet Cavern (credit to Vortiene)

- Added a stats page to the Pokedex that displays base stats and the type of caught Pokemon (again, credit to Vortiene)

- Made Sandshrew more common in Mt. Moon

- Improved the 'already caught' icon

- uncapitalised all new instances of "trainer" in the text to make it more consistent

- HOPEFULLY fixed the issue where the SS Anne still couldn't be reboarded
2023-11-20 11:00:20 +00:00
Martha Schilling 7655162dbd
Update songs.asm
Just a handful of music changes.
2023-11-15 10:15:25 +00: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 6496a46d1d Beautify Mt. Moon Crater
I made Mt. Moon Crater when KEP's ROM Hack was just starting, and in retrospect, it looked horrible. Lots of random things all over the place, not very layered, it really just looked like a normal route. Here, I've attempted to layer the crater more cleanly, added a "Zero Lab," and all-around improved the tree placement. Hopefully, this makes it more enjoyable to explore.
2023-10-23 13:45:51 +01:00
Martha Schilling b26c0ec934 Revert "Removing the dev door"
This reverts commit 855b1cb7ba.
2023-10-14 12:43:47 +01:00
Martha Schilling 855b1cb7ba
Removing the dev door
Literally every playtester so far entered the dev door so I'm removing it now
2023-10-09 09:32:20 +01:00
Martha Schilling f23b59d7b7 A few small changes
Just some very minor things I'm pushing while I work on the stubborn Silph Gauntlet Guard.

- Fixed the misshapen Poke Ball and Pikachu sprites on the 3DS Border, and gave Shocks the updated grey palette.

- Moved a trainer in Rock Tunnel that was accidentally made optional.

- Fixed some wording in Gavillain's dex entry

- Made wild encounters in Rock Tunnel have more consistent levels.
2023-09-24 22:58:46 +01: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 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 5fb468fe61 Silph Co. additional fixes
- Fixes the 7F -> 5F warp
- Removes the unused warp panel, moves the TM for Swords Dance over it, and the Rocket Grunts, accordingly.
- Fixes the strange machine blocks that had missing tiles, by removing them!
2023-09-03 13:49:44 +01:00
Llinos Evans ba12ca36d4 Mt Moon warp fix
Was mismatched
2023-09-03 13:42:28 +01:00
Llinos Evans 7d5f832876 Finalise Mt. Moon Square placement
This puts Mt. Moon Square into an area solidly reminiscent of GSC. To prevent breaking of progression, a Cut tree is placed where the exit out of Mt. Moon is.

Also, I replaced a Potion with a visible Moon Stone - felt awkward not having one. It's a bit out of the way, so players have to explore, which feels correct.
2023-09-02 20:08:55 +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 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
Llinos Evans 08b976a08b FRLG Legendary Battle theme
LuciShrimp strikes again! A demake of the Legendary Battle theme from FireRed/LeafGreen.

This theme is set to change down the line, possibly taking elements from the Emerald theme Mew uses to differentiate itself more. Mainly committing as the infrastructure has been put in place.
2023-07-23 21:06:28 +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 201faa3f40 Yay! Sapphic love!
Added dialogue for the two lover NPCs on Brunswick Trail. Yes, they're both very gay. Sue me.

Lover2's dialogue was written by my amazing girlfriend, so all credit to her on that one :3
2023-07-15 23:07:26 +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
Martha Schilling 21b3f0f5a7 More bug fixes!
- The Zapdos in Brunswick Glade now vanish correctly, due to fixing a desync in the hide/show data

- Brunswick Glade's palette displays correctly

- Improved Citrine City's theme a little

- Changed palettes for Cryithan's line to reflect their upcoming redesign

- Updated Cryithan's sprite
2023-07-15 00:07:05 +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 d4384e1512 listen this really annoyed me for like 3 months
moved that one sign in viridian that intersected with the pregym in a misleading way that just looked really annoying on the map PLEASE let me have this
2023-07-13 03:17:36 +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 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