Commit graph

3154 commits

Author SHA1 Message Date
MementoMartha
7d2357f46d Update README.md 2023-04-30 01:05:45 +01:00
MementoMartha
d0b65e945e Fixed several bugs
- Fixed an issue where KEP's new static encounters would sometimes not disappear correctly
- Fixed an issue where boulders wouldn't fall down holes
- Fixed issues where the SS Anne Rival and Oak in the Indigo Plateau wouldn't appear, causing a softlock
- Fixed an issue where the Mt. Moon fossils wouldn't disappear
- Added several items back after they were previously removed
2023-04-30 00:58:22 +01:00
Llinos Evans
760121d8fd Adding the last of the used moves
Dark Void and friends aren't in and probably won't be, I dunno yet.

I think Kowtow Cleave is really badass so I gave it to Night Slash too.

Scream Tail and Barunda now have Disarming Voice, which also has its own sound, which is basically Sing but a bit different.

Fake Tears was given its own subanimation to account for the fact it's basically a Water Gun used on yourself.

The FIGHT debug function helps a lot with this whole thing, so test with that.
2023-04-29 21:00:17 +01:00
Llinos Evans
7931dad49d Debug Battle doesn't replace attacks with Pound
I've commented out the code relating to this, which allows for us to test move animations better. It also frees up a WRAM slot.
2023-04-29 18:51:42 +01:00
Llinos Evans
46ffe095e6 Voltorb in Fuchsia
simply makes sense tm
2023-04-29 18:42:56 +01:00
MementoMartha
15762ead34 A few small improvements
- All of the Silph Gauntlet maps use the same palettes as the map's they're based on
- Viridian Forest uses Viridian's palette, it just makes sense
- Power Plant is now yellow, just 'cause.
- Game Corner payouts are much faster, and have been slightly rebalanced
2023-04-29 18:10:11 +01:00
Llinos Evans
2a662e0ec1 Update arbok.png
French Orange had a better idea for the back part
2023-04-28 20:39:47 +01:00
Llinos Evans
83f6200c74 New sprites just dropped
A selection of Game Corner sprites retooled to be overworld Pokemon. I also placed Voltorb, Diglett, and Magikarp.
2023-04-28 19:11:49 +01:00
Llinos Evans
583847ae2c Citrine Mart
This adds Citrine Mart, which is battle-centric. It sells all the "strongest" items and makes Max Revives renewable.

I made a specialised tileset for Citrine Mart, combining the old and new styles to make something that feels right.
2023-04-28 03:08:54 +01:00
Llinos Evans
d5708ef12e Citrine Pokecenter, trade refactoring
I am tired of doing the Legendary wing event, so I'm populating Citrine City.

Some notes;
- I refactored the In-Game Trades to match their nicknames and re-distributed them.
- I swapped Fuschia's bench guy for the third unused one meant for the safe house, but I may outright restore these.
- I refactored the Pokecenter Hidden Objects to all use the same set - they're clones of each other, so this works out. This saves a TON of bytes and works fine.
- I placed the Harry trade for Kadabra/Alakazam in Citrine Pokecenter as it feels right for such a powerful Pokemon to be post-game.
2023-04-28 00:48:09 +01:00
MementoMartha
ba78014ec6 Silph Gauntlet 4F trainers!
Includes the same healing pad that was in Lavender Tower, as a reward for getting halfway! Trainers can't currently see you, which I'll fix once I've added the trainers on 2F and 3F.
2023-04-27 19:55:35 +01:00
Llinos Evans
0b9bf6d8db Fix Celeste Grass
time traveller farted
2023-04-27 18:04:49 +01:00
Llinos Evans
f65e0dd3bf Groundwork for Galarian Bird event
This adds the first half of an event where you will find the Galarian Birds. It is not finished yet.

It currently bugs out when Galarian Zapdos tries to run away and I don't know why. Frame-by-frame, it seems to be when the player has to move. I've tried different things to make this less bad, but they don't work.

Here's how it's meant to go:
1) Articuno flies away (done)
2) Zapdos barges past the player like Silver does in GSC (bugs out)
3) Moltres moves in front of the player and engages (not done)

If anyone has a better way to do this, please let me know!

Minor changes;
- Connection for Brunswick-Citrine looks nicer
- Celeste has a few changes to make the event run easier.
2023-04-27 18:00:47 +01:00
MementoMartha
234f3e120d Making Brunswick Trail a route map
This fixes a bug where all of Brunswick Trail's tiles could have encounters.
2023-04-27 16:46:20 +01:00
MementoMartha
858e7bc92a Cactus and Gapdos now disappear after the battle 2023-04-27 10:34:23 +01:00
Llinos Evans
108fb01070 Brunswick groundwork, misc. changes
The groundwork for Brunswick Trail events has been done. Wild data, Cactus event, and Zapdos-G events are set up, plus an NPC. This also makes the Fake Tree sprite available.

I made the warp at the tunnel in Brunswick goes directly to Celeste Hill and back. Warp tile made functional.

Many bugs right now:
- Cactus doesn't disappear after battling it. Also, making this work how I want it to is hard.
- Pokemon are encountered on every tile, which is likely because it's considered to be indoors. In trying to fix this, I seemed to completely screw up the maps, so this isn't being committed. Handle this with care.
- I made a spriteset specifically for Citrine, but it doesn't seem to be working for Brunswick, likely because Brunswick is an indoor map and thus isn't just taking it.

Misc. changes:
- Moved Sandy Shocks to a 4% encounter slot in Mt. Moon Crater to be equal to Scream Tail.
- Restored the proper translation for the "rotten PRESIDENT" scientist, courtesy of Dr. Lava and Nob Ogasawara.
2023-04-27 04:08:27 +01:00
Llinos Evans
7850a87e83
Merge pull request #11 from pret/master
Update `EndBug` to v9.
2023-04-26 14:30:47 +01:00
MementoMartha
c5264f160a A few small fixes
- Brunswick Trail and Faraway Island now use correct palettes.
- Faraway Island has been altered slightly with the same tileset as Celeste Hill
- It's now possible to fly from Citrine locations, as well as Faraway Island, and the roof of both Celadon's Mart and Mansion.
2023-04-26 09:39:15 +01:00
dannye
1b9540cc49 Update EndBug to v9. 2023-04-25 19:40:00 -05:00
MementoMartha
14626866b6 Mt Moon Crater fixes
Now has new music (the Mt. Moon Square theme from GSC, which was originally planned as a victory theme in Gen 1), as well as functioning wild encounters and items.
2023-04-25 23:15:02 +01:00
MementoMartha
9938617229 Finally fixing the Gauntlet 1F Trainers
Adding trainers properly is hell, 1/5, would not recommend
2023-04-25 15:57:33 +01:00
MementoMartha
0b334abbf3 Silph Gauntlet 1F trainers!
Currently working fine except the trainers can't see you, which I'll try fixing soon
2023-04-25 03:15:43 +01:00
MementoMartha
6a693a931b Field06 fixed!
Also added a new palette for Brunswick, just trying to figure out a way to display it (possibly because Brunswick isn't listed as a Route map?)
2023-04-25 01:20:59 +01:00
Llinos Evans
2f82c377fe Ok the fight works now
Issues:
- Player only walks one space for some reason
- After battle text doesn't happen, so no Candy Jar

Otherwise, almost finished.
2023-04-25 00:47:19 +01:00
Llinos Evans
ca1cc6af90 Some progress on the Chief fight
Right now I'm facing a weird bug where if you enter, you get the quote, but the fight doesn't start and it happens while you're stepping for some reason. Very odd.
2023-04-24 23:22:35 +01:00
Llinos Evans
59a9bdb62e Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack 2023-04-24 14:27:20 +01:00
Llinos Evans
c3bb00b865 Cactus should have Barrage
While never having a full learnsetset, Barrage is listed as Cactus's signature move in some sources. Pendraken had "Squid-Ink" but that never made it.
2023-04-24 14:27:18 +01:00
MementoMartha
245185a403 oops
forgot to update the length of brunswick trail
2023-04-24 12:18:51 +01:00
MementoMartha
74b3907119 Brunswick Trail map connections 2023-04-24 10:11:16 +01:00
Llinos Evans
4ca269c429 Fix overflow & brunswick
Added a unique bank for evos_moves, which includes tradeback move tutor data.

Also, fixed brunswick's map parameters.
2023-04-24 00:58:56 +01:00
Llinos Evans
f73117d893 Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack 2023-04-24 00:43:07 +01:00
Llinos Evans
b4b08d0612 Brunswick Trail
To-Do List for Brunswick Trail:
- Galarian Zapdos event (give hide/show data)
- Tunnel to Celeste Hill (tileset moment)
- Couple by the sea
- Fake Tree (Cactus, may need a spriteset)
- Wild data (needs doing)
- Maybe a few trainers?
2023-04-24 00:43:05 +01:00
MementoMartha
7cf0395f7a Importing tradeback learnsets for the original 151
(also the evolutions and some of the regional variants too)
2023-04-23 23:06:53 +01:00
Llinos Evans
9b387cab7e Expanding on Pokemon icon usage
This adds Pikachu, Cat, and "Small Bird" menu icons. The cat has a custom animation done by myself.

The Jigglypuff in the Pokemon Centre now uses the new sprite, nice 'n' pretty. Officer Jenny is also in Cerulean. The Pokemon from Melanie's house in Yellow have been put in Mr. Fuji's House, given the purpose of the house in RB is different. I think it ends up fitting very nicely.

Chansey has been given its proper sprite in Fuschia. Yellow didn't actually do this, as Chansey doesn't have a walk cycle, causing the stuff that exists to go unused. I wanted it, though, so I had Chansey just not walk and turn around. Oh, and it's in all the Pokemon Centres now. Yeah, that's a...lot of changed files.
2023-04-23 21:25:45 +01:00
Llinos Evans
09ad875023 Finish Rocket House, Yellow sprite backport
Some big dubs for KEP today. This commit backports the Yellow overworld spriteset, and also adds the cat sprite for Meowth. This allows Jessie and James to use their overworld sprites in the Rocket House and serves as groundwork for backporting their other events.

There are altered Daisy and Nurse Joy sprites that may or may not warrant usage. That can be discussed.

Naturally, this also means there's a ton of overworld sprites to use elsewhere. Revamps of the "Bulbasaur house" in Cerulean and the Surfing Pikachu sprite change come to mind.

An & symbol has been backported from GSC for Jessie and James's trainer class as well.
2023-04-23 17:59:28 +01:00
MementoMartha
eba8947133 Very minor fixes
Fixes a few small text issues, updates the readme, and rebalances the fishing rod Pokemon. Also shifted Blottle to earlier in the Pokedex, cause I felt like it.
2023-04-23 16:18:02 +01:00
Llinos Evans
2f01628cd9 Groundwork for Tradeback Move Tutor
Currently the move tutor is a little bit broken - the IDs are 1 above how they should be. Shell speculates that it's searching at the table starting from Kangaskhan due to the way the decrements shake up but it may just be making things more complicated than they are.

Big cheese code is `PrepareTradebackMoveList`, it's where things are mucking up.

Also, the code can be significantly optimised, as it's currently being adapted from the function above, `PrepareRelearnableMoveList`; It doesn't need to check levels, for example.

Note that the relearner functions properly, so use it as a reference. I may have removed something important.

Technically, we could have NO_MON as an entry which may make things shake out properly. But I'd rather have a proper fix.
2023-04-23 06:11:05 +01:00
Llinos Evans
5e21c159f9 FEROCIOUS KICKS AND PUNCHES
This adds the Mega Punch & Mega Kick guys from FireRed and LeafGreen.

Given Mega Punch was in Mt. Moon, and GF replaced it with Thief in FRLG, I decided to change the TM to the Wing Fossil, which currently isn't obtainable outside of Mt. Moon Crater.
2023-04-23 00:26:33 +01:00
Llinos Evans
9f86539800 Close up Kanto again
This reverts some of the opening-up stuff we did. I kept the Cut Trees around Vermillion and Celadon Gym packed away, as they aren't problematic and forcing HMs in gyms is cringe. But, the absurd skips made possible by the other Cut Trees being gone is way too much - Celadon is a huge power spike and it throws Martha's fishing balancing off the rails.
2023-04-22 23:40:30 +01:00
Llinos Evans
78d3ed63f2 Citrine Rocket House
This map is pretty much finished, save for the map sprites for Jessie, James, and the unused Cat (aka Meowth) being imported, as well as an & symbol. This adds everything else - the marts, the Rocket Trio fight, the meeting music, the tileset, the trainer class for Jessie/James, I could go on. A ton of work well-done.
2023-04-22 20:49:19 +01:00
Llinos Evans
437602bf21 hm m yes carapthor
Altered the back sprite to be accurate to beetle wing cases, and changed the S.S. Anne Gentleman to use Carapthor (and Mr. Rime).
2023-04-22 17:07:05 +01:00
MementoMartha
594e4d7b80 moving Pudi, Hinaazu and Betobebii sprites 2023-04-22 12:22:46 +01:00
MementoMartha
027d9b4ee5 Kokana, Kasanagi and Carapthor!
A three-stage Bug line that mirrors the Caterpie and Weedle lines, being an old design for Weedle's evolutions. Pudi, Hinaazu and Betobebii have been removed, though.
2023-04-22 12:20:29 +01:00
Llinos Evans
e5c0587e08 capitals!!! 2023-04-22 10:26:14 +01:00
Llinos Evans
fb9977457a Carapthor dex entries
4 martha
2023-04-22 10:24:49 +01:00
MementoMartha
c8164fcd2d Update cry_headers.asm
New cries for Rhyperior and PoryZ. Took many attempts to make PoryZ's but I feel like it sounds fine now
2023-04-21 11:12:17 +01:00
MementoMartha
707e3ae7a9 Lavenbar Island-Town
This is an attempt to recreate the music in the video below. Still unfinished as the new channel isn't in sync.
(https://www.youtube.com/watch?v=60toSFxt_Jo&t=59s)
2023-04-20 21:28:48 +01:00
MementoMartha
b2bab794c7 Updating Taaban's cry 2023-04-20 15:07:22 +01:00
MementoMartha
f242ae1356 Update cry_headers.asm
Adding a few more cries and tweaking a few of the already-added ones.
2023-04-20 14:47:44 +01:00
MementoMartha
e4380a39a4 Gen 2 cries + Earthtron!
Giving all the gen 2 evolutions their finalized cries (including Tsubomitto's) and also adding the unused 'Earthtron' cry for Gorochu, Crocky and Jagg.
2023-04-20 09:09:46 +01:00