Commit graph

754 commits

Author SHA1 Message Date
Martha Schilling
640464ff1b More superb Albatross sprites,,,
LOOK at Golem. oh my god
2024-01-02 23:15:06 +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
Misty
0613b7bb82
Merge branch 'PlagueVonKarma:master' into master 2023-12-31 15:48:36 -05:00
Misty
8829d994e7
Celeste Hill Cave Encounter Update 2023-12-31 15:47:37 -05:00
Misty
5dcd67b717
Celeste Hill Encounter Update 2023-12-31 15:46:20 -05:00
Misty
84555faa59
Garnet Cave Encounter Update (B1F) 2023-12-31 15:45:15 -05:00
Misty
79fae412c1
Garnet Cave Encounter Update (2F) 2023-12-31 15:44:42 -05:00
Misty
795a3e9adc
Garnet Cavern Encounter Update (1F) 2023-12-31 15:42:50 -05:00
Misty
1d0e601d98
Brunswick Grotto Encounter Update 2023-12-31 15:38:39 -05:00
Martha Schilling
09f2c83e72 Mewtwo sprite improvement! 2023-12-31 16:59:29 +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
dacb23f87b Update RockTunnelB1F.asm
lol we accidentally made Kleavor postgame-only, fixing that now
2023-12-30 17:26:51 +00:00
Martha Schilling
72b5bd7b0e Fixing some text inconsistencies 2023-12-30 15:39:34 +00:00
Martha Schilling
5760e27617 Fixing the Brunswick Glade NPC bugs
Almost there...
2023-12-28 21:40:05 +00:00
Martha Schilling
7b2a5e5d7f Postgame boss movesets: Batch 2
Includes the final Jessie and James fight, and the Elite 4 and Champion rematches.

I'm finally done with these movesets and it's never been better.
2023-12-28 13:12:39 +00:00
Martha Schilling
dbc9fe2929 Postgame boss movesets: Batch 1
Includes Professor Oak's 5 teams, Chief's team, as well as the postgame teams for Yujirou, Koichi, Brock, Misty, Lt. Surge, Erika, Koga, Sabrina and Blaine.
2023-12-27 23:31:30 +00:00
Martha Schilling
e401f05495 Update evos_moves.asm
how long has Vap's moveset been broken holy shit
2023-12-27 23:00:09 +00:00
Martha Schilling
5859ea25ea Giovanni's Room theme
okay look I did this months ago and now I'm finally pushing it

This gives Giovanni's Room its own theme, which is a slower-tempo version of the Rocket HQ theme that's missing channel 1.
2023-12-27 22:18:23 +00:00
Llinos Evans
bdf89fd6d2 Safari Zone tweaks
Added some Cubones since it's featured in the Safari Zone in Yellow and Pokemon Origins. Changed the second Chansey's level to 7 for consistency.

Also fixed an error on the Safari Zone Area 1 sign that said Centre Area, which was fixed in FRLG. Thanks to Lyra made a website for pointing this out!
2023-12-27 11:20:39 +00:00
Martha Schilling
602013ca51 Pre-Champion Boss trainer movesets! (finally! again!)
Now. Please. I beg of you. Do not change any more level up movesets unless necessary. I will not be going back to check these again. Doing this is pain.
2023-12-26 17:14:39 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
defbcb68d0 boat fix + polishing dex entries 2023-11-29 18:01:56 +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