Commit graph

3698 commits

Author SHA1 Message Date
Martha Schilling 1e9b06773f Changing a default player name for Green
I know that some people are gonna ask if 'Seren' is a misspelling of 'Serena', so I'm changing it so we won't get questions like that. It's now Elaine, which is the name of the LGPE protag so...kinda works

Also changed an inconsistency in Erika's 6 badges party where her Cactormus was a higher level than it should've been
2023-12-26 14:59:02 +00:00
Martha Schilling 84cf9e9bff Oak's Lab improvements
- Fixed some collision on the back wall

- Made the exit tiles more obvious
2023-12-26 12:26:16 +00:00
Thorn Avery 8ccfe3e992 Merge branch 'mistress' into renewables 2023-12-26 11:49:12 +11:00
Thorn Avery f1bee1c621 Merge branch 'master' into mistress 2023-12-26 11:47:55 +11: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 0da18d9101 Celeste Hill and Brunswick wild encounter glitch fixed
The fix really was that easy, huh.
2023-12-25 13:16:44 +00:00
Martha Schilling df4bc37d7d whoa! new vire backsprite!
(whoa!)
2023-12-24 22:48:31 +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 16741e9d9b
Merge pull request #31 from LadyMisticus/patch-1
Geodude Line update + Nidoreign Tweak
2023-12-24 20:56:50 +00:00
Misty 200dc696aa
Geodude Line update + Nidoreign Tweak
Integrated the new Geodude line movesets, as well as added Spike Cannon to Nidoreign's level-up moveset. (Might've been accidentally removed, as it was on the spreadsheet but not in the code.)
2023-12-24 15:37:48 -05:00
Llinos Evans 154f4bc6bc more precise credits 2023-12-24 18:52:30 +00:00
Llinos Evans fd03388931 Fix Pikachu and Eevee's Starter Dex entries
Forgor
2023-12-24 18:29:43 +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 355661350e Updated fishing encounter tables
Also gave Sharpoon a rare Surf encounter on the Sea Routes.
2023-12-24 12:22:39 +00:00
Llinos Evans 5f168c2b25 Polish Mt. Moon Crater theme
General cleaning up of the track, smoother loop, among other bits and pieces.
2023-12-22 14:54:37 +00:00
Thorn Avery d6d897b270 Merge branch 'mistress' into renewables 2023-12-22 09:07:38 +11:00
Thorn Avery 85bbe08815 Merge branch 'master' into mistress 2023-12-22 09:07:23 +11:00
Martha Schilling 0dc88447e2 Mt Moon Crater improvement (wait, didn't we already have this today?)
I'M ON A FUCKING ROLL HERE AND I WON'T STOP

- Made Mt. Moon Crater have a more 'mystical' purple palette at LuciShrimp's request :3
2023-12-21 20:04:51 +00:00
Martha Schilling 67445c0c3b Sprite updates (again!)
- (Albatross) Updated Annihilape's back sprite so there isn't any cutoff

- (Martha) Made Jynx less racist for the second time

- (Albatross) Polished Bellossom a little, mainly improving the face and shading
2023-12-21 19:24:30 +00:00
Martha Schilling 20444bb9e9 Small palette changes
- Fixes a bug where the player's house would have the wrong palette after returning there after beating the Champion

- Gave Jabetta's line the dark purple/peach palette since I just thought it looked better
2023-12-21 17:06:55 +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 75c66e5069 Update main.asm
lol it actually builds now
2023-12-21 14:27:54 +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
Thorn Avery 945abcef1e Merge branch 'mistress' into renewables 2023-12-21 15:26:00 +11:00
Thorn Avery b1feca4361 Merge branch 'master' into mistress 2023-12-21 15:25:41 +11:00
Llinos Evans 43de80f43c
Merge pull request #30 from thornAvery/master
Battle Tent Fix
2023-12-21 04:18:39 +00:00
Thorn Avery c2a46acf85 oops naughty thorn messing with ram layout 2023-12-21 15:12:58 +11: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 bfc9b6f19d Merge branch 'mistress' into renewables 2023-12-20 12:10:48 +11:00
Thorn Avery e8f4014b01 Merge branch 'master' into mistress 2023-12-20 12:10:37 +11:00
thornAvery 52d6108dbe
Merge branch 'PlagueVonKarma:master' into master 2023-12-20 12:09:45 +11:00
Martha Schilling 080ca3866b Update gorillaimo.png
I meant to include this in the last commit but I forgor
2023-12-18 11:51:01 +00: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
Thorn Avery 6eec9833cd Merge branch 'mistress' into renewables 2023-12-18 14:24:57 +11:00
Thorn Avery 1346ad0266 Merge branch 'master' into mistress 2023-12-18 14:24:32 +11:00
Martha Schilling e76cb8c9e8 Starter moveset updates!
Made the Bulbasaur and Charmander line's movesets better, more closely matching Squirtle's updated moveset.
2023-12-17 18:25:34 +00:00
Martha Schilling 5305e19ca4 DK! Donkey Kong! (Huh!)
Finally, he's here for you
It's the last member of the KEP crew
This Mon's so strong, it isn't funny
Can make a Dark-type cry out for mummy
Can push a boulder with relative ease
Makes Strength puzzles seem such a breeze
He may move slow, he can't learn Fly
But this Mon's one hell of a guy!
2023-12-16 20:38:29 +00:00
Llinos Evans 02df5d3abf Prototype level-up move restorations
Geodude and Squirtle require some restructuring to implement adequately, some other issues.

This adds level-up moves learned in the RG prototype that are learned only via TM in the final to various Kanto Pokemon. Significantly buffs some underwhelming Pokemon and adds utility to moves like Take Down.
2023-12-13 12:53:30 +00:00
Martha Schilling 64724faa00 Update ViridianCity.asm
oops
2023-12-13 12:29:27 +00:00
Martha Schilling d71eb00054 Boss trainer movesets! (finally!)
Well, most of them, at least. All of the bosses before and including the Elite 4 have had custom movesets added, and I'll work on the remaining postgame trainers later. This still needs some testing to ensure they're all correct, but I'm committing this as is for now.
2023-12-13 12:00:11 +00: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