Commit graph

474 commits

Author SHA1 Message Date
Martha Schilling f9bbabbcca WE ARE TEAM ROCKET, YOU CANNOT BEAT US
- Adds a slightly remade version of the Rocket battle theme that plays when fighting Rocket Grunts, Jessie & James, and Giovanni (1 and 2)

- Giovanni 3 and Chief now share a new battle theme composed by myself and LuciShrimp, which is a slower, more intimidating remix of the regular Rocket fight theme.

- Gave Giovanni 3 his own trainer class, allowing for better AI routines and smarter move choices.

- Removed Giovanni's name from the Viridian City Gym statues to keep his identity a further secret. It also made more sense than in vanilla.

- Gave the postgame Morimoto fight a better selection of moves.
2024-01-06 17:11:31 +00:00
Martha Schilling a486ec7657 Update LancesRoom.asm
this always bugged me so I'm importing this small change from PureRGB
2024-01-04 22:49:02 +00:00
Martha Schilling a2acee24e7 Music fadeout before Champion fight 2024-01-04 22:18:45 +00:00
Martha Schilling 0da7a93ca6 Solving Mew's identity crisis 2024-01-02 15:19:56 +00:00
Martha Schilling fe651a7668 jojobear, our saviour
took out 4 bugs in one go, absolute legend
2024-01-02 11:17:58 +00:00
Martha Schilling 443277ffc8 WE
ARE

SO

BACK!!!!!
2024-01-01 21:15:44 +00:00
Martha Schilling caa8076bcd A few things
- Added a gate between the two halves of Route 10 on the right side of Rock Tunnel that contains the Graveler trade NPC.

- Improved Faraway's encounter table.

- Made the music go silent before battling both of the postgame bosses for suspense reasons. It also sounds cool.

- Minor text fixes
2023-12-31 12:22:36 +00:00
Martha Schilling 4c0dfdfedd Improvements to Chief!
- Now has a rematch team, just with boosted levels

- Has unique dialogue if you never picked up the Master Ball before fighting him, including after winning

- Has new dialogue on subsequent matches

We're nearly done.
2023-12-30 22:39:09 +00:00
Martha Schilling d20207f012 Salesman 'Obtained item!' text
Yeah for some reason the salesman didn't actually tell you that you got the item. Meanie.
2023-12-30 20:10:11 +00:00
Martha Schilling 980664075b Yay!
Fixed a glitch again!
2023-12-30 16:29:55 +00:00
Martha Schilling 8893f847a0 HAHAHA FUCK YOU YUJIROU
WE WIN

PRAISE BE TO RAINBOW METAL PIGEON, OH MY GOD
2023-12-29 23:21:42 +00:00
Martha Schilling 1eed8f03d5 Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack 2023-12-29 22:37:28 +00:00
Martha Schilling 51185204d0 One more bug down! 2023-12-29 22:37:14 +00:00
Martha Schilling 3b3b95d41f
Merge pull request #32 from thornAvery/master
fixed battle tent rewards
2023-12-29 22:26:37 +00:00
Martha Schilling da4082bca3 Update ViridianPreGym.asm
This makes it so you don't miss the Bottle Cap gift that Yujirou gives you, even if you beat the Elite 4 before him. There's a similar issue with the Fighting Dojo where the same thing happens but I'm less sure on how to fix that one...
2023-12-29 20:34:45 +00:00
Martha Schilling 9b4a9d5839 Yujirou is now marginally less of a twat
He now gives you a Bottle Cap when you win, but still crashes the game when you lose for some reason...
2023-12-29 19:11:11 +00:00
Thorn Avery 4c2b518188 fixed battle tent rewards 2023-12-29 20:16:26 +11:00
Martha Schilling 5760e27617 Fixing the Brunswick Glade NPC bugs
Almost there...
2023-12-28 21:40:05 +00:00
Llinos Evans 5ea0fc5de9 New starter pathing, beautify Oak's Lab
Please stop asking me about the sprite limit i beg u

Ok so this commit does the following;
- Oak's Lab now uses the Fossil Lab tileset, featuring lots of new contraptions etc to make up for the old removed aides.
- Places the Pikachu and Eevee starters in a new place, which results in a slightly blocky mess, but does the job.
- Fossil Lab tileset graphic has many new things. Lots of bad tiles in the blockset in case we want to use this more.
- Changes the rival's pathing so he, y'know, works on the new map...
- Re-adds the Oak email thing, but I had to do like 4 stupid workarounds because it was broken for unknown reasons. Just made it a generic bg event with no issues.
- Removed the old oak email event; no visible difference.
2023-12-25 22:15:27 +00:00
Martha Schilling 543ea46d8e Koichi unique trainer class!
Well, 'unique' is VERY loose here. He looks and behaves identically to a Black Belt still, just with a proper name and a higher payout. He replaces the unused Junior class.

In addition, I've brought back the text on the scrolls on the back wall in the Fighting Dojo that were accidentally inaccessible for a while.
2023-12-24 22:18:00 +00:00
Llinos Evans 154f4bc6bc more precise credits 2023-12-24 18:52:30 +00:00
Llinos Evans 39b1340dda Fighting Dojo fix
Admittedly very very comical.

Moves the normal processing checks down to where the normal processing actually happens.
2023-12-24 18:21:21 +00:00
Llinos Evans 6678af8722 Silph Gauntlet reset-on-victory
This functionally turns the Silph Gauntlet into a battle tower of sorts.

I did notice some weirdness post-event-reset so definitely do some tests. It should be fine, though.
2023-12-24 18:13:41 +00:00
Martha Schilling 8514a917de "There's no way fixing the post-HoF blackout crash is that easy."
"...it's that easy."
2023-12-21 16:29:21 +00:00
Martha Schilling e3b924a0ed Mt. Moon Crater improvements
- Made the warp down to the crater an actual hole instead of a cave entrance

- Added a path below the water section to prevent softlocks
2023-12-21 11:33:16 +00:00
Llinos Evans 43de80f43c
Merge pull request #30 from thornAvery/master
Battle Tent Fix
2023-12-21 04:18:39 +00:00
Thorn Avery 163b1b060c Battle Tent: working! (for real this time!!) 2023-12-21 15:11:21 +11:00
Martha Schilling 743a645c5e god i need some help with this
I'm trying to make the warp to Mt. Moon Crater a hole warp like the ones from Seafoam Islands, but I cannot seem to get to work at all, the hole just doesn't send me down. I know I'm clearly missing something, but I'm committing as-is in the hopes that someone could have a look at it
2023-12-20 12:09:06 +00:00
Thorn Avery f126a26243 Battle Tent: working! (assuming union is ok) 2023-12-20 18:49:51 +11:00
Thorn Avery 8e03534fc6 WIP Battle Tent: BCD Add not working :( 2023-12-20 18:18:16 +11:00
Thorn Avery 27f898e583 WIP Battle Tent: winnings based on streak 2023-12-20 17:29:21 +11:00
Thorn Avery 1b0b7a281c WIP Battle Tent: winnings based on streak 2023-12-20 16:58:51 +11:00
Thorn Avery 12b5fb8f8e WIP Battle Tent: win counter on each battle 2023-12-18 20:01:57 +11:00
Thorn Avery 86ede20d97 WIP Battle Tent: win counter displayed text 2023-12-18 19:45:24 +11:00
Thorn Avery ce2d9ec06c WIP Battle Tent: win counter 2023-12-18 19:04:33 +11:00
Thorn Avery 2a6c2604bd WIP Battle Tent Fix 2023-12-18 17:11:30 +11:00
Llinos Evans 4dd40a5818 Brunswick Glade & Celeste Hill Trainers
I fucked up the Brunswick Glade trainers somewhere - some text isn't sync'd and they won't come up to the player. Otherwise, it's done.
2023-12-12 22:10:24 +00:00
Llinos Evans 61acbe44c9 Add Morimoto Boss Fight from LGPE
Uses the team from the LGPE boss fight; quotes are from a mix of games across the series; appears after the game is beaten.
2023-12-11 23:21:54 +00:00
Llinos Evans 5eb44b1794 brunswick items
In the glade and trail

could possibly move some to the grotto itself; I wasn't sure what to put there

I realised that I don't have polishedmap on this laptop so you'll want to move the items elsewhere
2023-12-11 13:16:38 +00:00
Thorn Avery 337a05fee4 regional trades reset at HoF 2023-12-05 06:52:06 +11:00
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 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 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 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 3e811d4ed1 FINALLY
oh my god plague thank you for figuring this out this took me like 2 months to get working properly
2023-11-23 20:30:00 +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 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
Thorn Avery 4ca5573837 fixed james bottle cap handling 2023-11-13 12:38:21 +11:00