Commit graph

3612 commits

Author SHA1 Message Date
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
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
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
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
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
Martha Schilling 5ebcc9eac3 Update palettes.asm
Theoretically, this should get rid of the dumb glitch where Mew turns purple after Transforming? I did a bit of testing and seemed fine but if this causes issues for some reason then I'll remove it
2023-12-12 16:27:28 +00:00
Martha Schilling ab9e7ab030 Update ship_port.png
that previous change inverted the fucking palette somehow i am going to scream
2023-12-12 10:16:54 +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
Martha Schilling 62fb13c3b3 why do the goldeen and psyduck lines not learn water gun by level up what is wrong with the learnsets in this game
Also relocated the aforementioned items and made Celeste Hill look a bit nicer.
2023-12-11 14:14:49 +00:00
Llinos Evans c3d92fb62f celeste/brunswick trainer groundwork
dist sucks but the parties are there

found unused trainers we could also dot around
2023-12-11 13:32:05 +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
Martha Schilling 2b2c95e52b Actually working postgame warps!
FINALLY managed to get this working. The bugged warps are now working and the jank ones are less jank. Also removed the cocoon's pre-evolved moves again.
2023-12-08 17:37:41 +00:00
Llinos Evans bed705ac0d More precise Helix Chamber credits
In actuality, only RacieBeep and Orchid ever had sprites used. This fixes everything and makes them more precise.
2023-12-08 14:11:16 +00:00
Llinos Evans 80095b862b
Merge pull request #29 from ZetaNull/master
Polish up porygon's sprite a little more
2023-12-08 07:17:23 +00:00
Llinos Evans b823e50e72
Merge pull request #28 from thornAvery/master
regional trades reset at HoF
2023-12-08 07:17:16 +00:00
Martha Schilling c93beb4d72 Improving movesets! (Improvesets?)
- Rhyhorn's evolution line get moves at earlier levels, and now learns Rock Slide and Earthquake by level up.

- Clefairy gets Body Slam by level up.

- Nidoking and Nidoqueen get Earthquake by level up. Nidoreign instead gets Rock Slide and Body Slam.

- Grimer and Muk get moves at earlier levels, and also Acid and Haze (from Smujj)

- Scyther gets Wing Attack much earlier. Scizor keeps Double Team as a level up move, instead getting Iron Head at Level 1.

- Tangela and Tangrowth get moves at earlier levels, and also Night Shade (from Burgela)

- Geodude's evolution line now get Rock Slide by level up.

- Paras and Parasect get Absorb (from Paraspor).

- Psyduck learns Tail Whip earlier.

- Magnemite's evolution line get moves at earlier levels.

- Koffing and Weezing get moves at earlier levels.

- Seel and Dewgong get moves at earlier levels, and also Powder Snow.

- All Tauros forms get a new move by level up (Body Slam, Low Kick, Flamethrower and Water Gun respectively) and learn Tail Whip much earlier.

- Trampel gets moves at earlier levels, plus Body Slam and Earthquake as level up moves.

- Gavillain gets ThunderShock, with a few moves pushed back to later levels.

- Sharpoon gets moves at earlier levels, plus Smart Strike.

- Bittybat's evolution line get moves at earlier levels, and Golbat evolves into Crobat slightly earlier.

- Doduo's evolution line get moves at earlier levels, plus Quick Attack (from Dodaerie)

- Jynx gets Powder Snow as a level up move.

- Meowth, Persian and Perrserker get moves at earlier levels.

- Vulpiii's evolution line get moves at earlier levels.

- Ribbito and Croakozuna get moves at earlier levels.

- Omanyte, Omastar, Kabuto, Kabutops  and Aerodactyl all learn Rock Throw by level up.

- Seadra gets Pin Missile.

- Ministare and Iguanarch get moves at later levels, and Ministare evolves slightly later to match Dragonair.

- Sandshrew and Kantonian Sandslash get Earthquake by level up.

- All 3 cocoon Pokemon their pre-evolution's moves as Level 1 moves, and try to learn Harden each level before evolving again.

- Beedrill gets Fury Attack slightly earlier.

- Pendraken gets moves at earlier levels.

- Weirduck gets moves at earlier levels, and evolves into Golduck slightly earlier to match vanilla.

- Golduck also gets moves at earlier levels.

- Guardia gets a few moves it was missing from prior evolutions.

- Orfry gets Fury Attack slightly later, but both Goldeen and Seaking get moves at earlier levels. Seaking also gets Swords Dance by level up.

- Ponyta and Rapidash get moves at earlier levels.

- Bellignan gets a few moves it was missing from prior evolutions.

- Hitmontop learns Focus Energy earlier.

- Wugtrio gets moves at later levels to match Dugtrio.

- Sirfetch'd learns Leer and Double Kick later, but all other moves earlier.

- Melmetal no longer gets Smart Strike.

- Alolan Dugtrio gets Sand-Attack and a slight moveset shuffle.

- Alolan Golem gets Defense Curl, Rock Slide by level up, and a slight moveset shuffle.

- Galarian Slowbro and Slowking learn moves at later levels, with Slowbro getting Withdraw and Sludge.

- Various evolved Pokemon getting L1 moveset additions to remain consistent.
2023-12-07 23:10:42 +00:00
Zeta_Null 9ffacf00d8 More polishing up porygon 2023-12-05 13:30:57 -05:00
Martha Schilling 5e675af15d Sprites? No, I prefer 7-Up
Added updated sprites for:

- Front: Sirfetch'd, Galarian Rapidash, Porygon, Carapthor

- Back: Blissey, Carapthor, Espeon, Glaceon, Hitmontop, Kleavor, Lickilicky, Magnezone, Melmetal, Galarian Moltres, Mr. Rime, Perrserker, Pupal, Rhyperior, Sandy Shocks, Scream Tail, Galarian Slowbro, Paldean Tauros Combat Breed, Toedscool, and Umbreon

(also some minor text fixes, notably adding Dr. Lava to the credits)

Thanks Albatross for being a total legend :3
2023-12-05 17:15:12 +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 be54c19109 SURGE, FIX YOUR DAMN GYM
- Changed some text in Vermilion Gym to allude to the infamous trash can bug.
2023-12-02 16:09:13 +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