Commit graph

65 commits

Author SHA1 Message Date
Thorn Avery 684a075631 Merge branch 'mistress' into renewables 2025-09-13 16:31:16 +10:00
Zeta_Null 6726f5fec1 Enby YES
internally kind of sloppy, filenames refer to Pink as a few different things and none of them are by their final name lol

Haven't managed to get this to build the debug rom? Probably not a big deal, though you have to specifically run "make kep" instead of just "make"
2025-01-07 02:17:30 -05:00
Thorn Avery 02536e80ac Merge branch 'mistress' into renewables 2024-11-28 10:08:13 +11:00
Llinos Evans 6292c39217 This should end it! - Entei
- Fixed up the Fishing Rod encounters.
- Finished the Pocket Lapras
- Farfetch'd on Route 13 and 15
- L50 Chansey on Victory Road 3F for Repel trick grinding
- Changed Surge's text to be way, way more accurate to the differences between American and Japanese relations at the time. See file for more details.
- Fixed the build error with the new Galarian Bird track
2024-08-25 21:21:55 +01:00
Martha Schilling 14f08c941d The Big One Again
Pushing everything I've done, currently doesn't build because the Galarian Birds filesize is too thicc for the section but I need to push this before I go mad
2024-08-25 19:39:01 +01:00
Thorn Avery 6d4920da06 Merge branch 'mistress' into renewables 2024-06-03 18:33:13 +12:00
Martha Schilling 2c02483f01 Small polishing of the previous commit + Item Sorting
- Fixes a few bugs from the last commit, namely:
     - The guy who gives you the Pocket Lapras having bugged text
     - Being able to use it where you shouldn't (Cycling Road, Seafoam before the boulder puzzle)
     - Pocket Lapras not having an item description

- As well as this, automatic item sorting has been added. Just press Start in the bag menu and all your items will get assorted into a convenient list.

- Changed a few item descriptions since some of them didn't terminate properly

- Freed up some space in the Home bank
2024-05-14 21:17:36 +01:00
Martha Schilling f675c1ad9b Gen 5 Repel system
Also used in PureRGB. Gives the player the option to use another Repel after the last one runs out.

I had to remove some debug features in order to fit it in, but it won't have an effect on the regular game. Hopefully.
2024-04-15 13:01:52 +01:00
Thorn Avery 94ef32cb10 portable pc 2024-01-29 16:43:33 +13:00
Martha Schilling 7742104bbb Bug Fixes and stuff!
(kinda just clearing my commits list while I'm working on 1.3 still.)

- Lance's Room is no longer listed as a dungeon map

- Changed the layout of Cinnabar Volcano YET AGAIN, making it a little more visually appealing. If you get softlocked here, I will just sigh disapprovingly.

- Various moveset fixes:
     - Arcanine-H gets EQ and Fissure now
     - Raichu-A loses Counter
     - Raticate-A gets TBolt and Thunder
     - Swapped Bullet Punch and Iron Head around in Scizor's learnset
     - Umbreon gets Psychic
     - WigWug both now get Ice Beam and Blizzard
     - Seel and Dewgong get Water Gun by level up
     - Swapped inconsistent moveset levels for Omanyte and Omastar
     - Eevee gets Quick Attack earlier

- Fixed a typo in Slowbro-G's dex entry

- Changed the Tauros Combat Breed trader's text to remove a moveset inaccuracy

- Changed Misty's AI to now use X Specials instead of Potions

- Gave Chief's teams a slightly updated moveset

- Fixed an issue where Steel just...didn't resist Rock? How did I miss this?????

- Made Sandshrew more common in Mt Moon B2F

- Changed the Marowaks on Silph Gauntlet 4F to Guardias

- Fixed issues where receiving a Gym badge wouldn't play the correct sound in most situations

- Increased the level of the Salesman's Cubone gift from 17 to 23

- Decreased the levels of the Fossil gifts from 44 to 35

- More text fixes

-
2024-01-26 23:20:54 +00:00
Martha Schilling bc4f0b83e8 okay did you know they misspelled this move until X and Y
adding it back for the sake of consistency! this is Gen 1, dammit!
2024-01-07 00:53:01 +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 72b5bd7b0e Fixing some text inconsistencies 2023-12-30 15:39:34 +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 508a4e790e The Big One.
Whoa, this one's been in the making for a while now. This one has been my attempt to fix as much as I could within a little over a month. Here's what I've got for you.

- Fixed a bug in Silph Gauntlet where the trainers would not see you unless you spoke to them

- Removed the unnecessary Gawarhed and Wugtrio static encounters. In what was once Gawarhed's place is a Rare Candy.

- Implemented a working ferry system (huge thanks to Red++) that allows travelling to Faraway Island and Citrine City with the right tickets. Currently both maps use a copy of the SS Anne, which may be revised later.

- Bittybat, Magnetite and Burgela have been removed to fix a Pokedex bug where entries wouldn't display correctly if the total number wasn't a multiple of 8.

- Fixed a bug where fishing up a Wiglett and Wugtrio would play the trainer battle and Champion battle themes respectively

- Restructured the Pokedex a little. Don't worry, Lickitung's still number 108!

- All references to betamon in the disassembly have had their names updated to match the new Ogasawara ones

- Removed Blastyke as a Game Corner prize, replacing it with Squeamata.

- Garnet Cavern is now properly listed as a dungeon map

- Fixed an issue where trying to leave Bill's House after entering the garden would put you back in the garden

- Moved Silph Gauntlet's Beauty down 1 floor to make the number of trainers on each floor more consistent

- Finished Gauntlet 6F except for the trainer text (PvK please help)

- Gavillain's stats updated to match KEP 1.4 on the Showdown server. It's now a Dragon/Electric type with less Ice coverage.

- Fixed Clefable's and Wigglytuff's starting movesets from an earlier commit

- Fixed an ABSOLUTELY HORRIBLE, EGREGIOUSLY FRUSTRATING BUG that caused the Pokedex's seen counter to rarely update. This is what caused this commit to be delayed for so long. No joke.

- New sprites, courtesy of Albatross, for Sylveon's back sprite, Alolan Marowak, Alolan Muk, Galarian Weezing and Magnezone!

- Fixed a bug preventing the trade for Haunter from being accessed.
2023-09-19 23:34:25 +01:00
Llinos Evans 57186bb2a0 Re-frame Red/Green character options
This re-frames the intro to have Red and Green be framed in a gender neutral manner. The main aim here is to be a bit more appealing to the NB types, be more consistent with the modern game's approach to gender, and allow people to feel comfier with Red's androgynous appearance.

Oh, and there's a confirmation option to utilise this more effectively, along with some cool transitions. Very happy with this commit.
2023-09-07 21:21:15 +01:00
Llinos Evans 754e1cdf28 suloku's modernised Exp. All
suloku dropped a really good guide on implementing modern Exp. All into RBY, making the item actually useful.

This basically fixes all the issues, but does expose one thing: Gaining Exp takes...a long time. So when you have one Pokemon KO another and have 5 others in waiting, the load time before leaving the battle will take about 3 seconds. This is definitely disorientating, but is still much, much, much faster than the original.
2023-07-27 21:54:31 +01:00
Llinos Evans c4afafb9ac Groundwork
Letter is there, post-game warp is done, new post-game event where you receive the letter isn't working properly
2023-07-12 17:44:25 +01:00
Llinos Evans 0aab4fb5e8 Mystery Box bugfixes and improvements
- Meltan is now loaded in engine/battle/wild_encounters.asm, allowing its level to be fixed at 5 and avoiding various glitches. This also fixed the "running from Meltan ends the Mystery Box game" bug.
- Candy Jar now gives a message when it's full, more transparent to the player.
- Fixed a bug where the increment text wouldn't load properly, it was very silly.
2023-07-03 15:41:31 +01:00
Llinos Evans a3c81c549c Charmander & Rod House move
This adds Damien, the Charmander trainer, with text changed to be more accurate to his character.

I've also moved the Pewter Rod House nearby, as it makes more sense for it to be in the Water-type area. However, it seems to load oddly.

I have also integrated the Pikachu/Eevee Mode more, with architecture that it can make it more easily modified. This'll come into play for the Squirtle event.

I have also erased further misinformation the game gives about burns, and changed the Viridian Pre-Gym accordingly, to talk about confusion, which lacks a Trainer Tips sign.
2023-06-28 16:31:14 +01:00
Llinos Evans c716be39da Daycare Revamp (except Bulbasaur)
In the name of making Pikachu/Eevee mode more accurate to Yellow, the starter trio are being made obtainable. However, I am also improving it in some respects to make it more accurate.

In the anime, the Hidden Village is between Cerulean and Vermillion, so Yellow's implementation is inaccurate. It also pushes the Jynx trader out of the house, which is undesirable.

Thus, Melanie has been placed in the Day Care to give more reason to go there, as well as make the Day Care look more like the one from FireRed and LeafGreen. In the name of this, a PC has been added as well, allowing for easier utility around the Day Care itself.

Bulbasaur is currently allergic to hiding for some reason but we'll figure that out later.
2023-06-28 01:04:09 +01:00
Llinos Evans 27cc616c0d Fix "Oak's Last Pokemon" line
Done by refactoring the Fighting Dojo greed line.

Also shifted some wild levels for extra variance.
2023-06-27 13:42:48 +01:00
Llinos Evans c356ee81f5 Saffron Guards are now British
They desire the caffeine...

Mt. Moon Square no longer breaks game balance.
2023-06-18 09:12:42 +01:00
Llinos Evans 5279e8a06e Establish Brunswick Grotto
The warp at the moment is an absolute travesty, something on that tileset needs to change. Either that or we figure out something else.

Everything in the Grotto is done, except for making Galarian Zapdos disappear after being defeated. At least, to my knowledge...

Pokemon Tower 3F is dead until future notice - Martha said she wanted to compress the Diglett's Cave maps, though.
2023-06-17 07:56:30 +01:00
Llinos Evans 3b678b7fd3 improved 1/256 text
got a few suggestions and this tracks better, doesn't look as awkward. text limit really twisting my arm here.
2023-06-12 15:06:28 +01:00
Llinos Evans 35851ef6a9 LGPE Beauty Event
This is basically done, but has a few glitches to iron out that I don't have time to do today. So, I'm sending this in as-is with the intent to finish (or someone else can idc) it later.

I initially thought to restrict this to after Vermilion Gym but Persian is really bad and Arcanine doesn't compare to the L30 Dugtrio, so I think it's ok. Just barely balances itself out.

Bugs:
- GiveMonName doesn't work properly for the Vermilion Beauty after receiving the Pokemon, jank ensues.
- Text scrolls immediately when receiving the Pokemon from the Vermilion Beauty.
2023-06-07 11:17:47 +01:00
Llinos Evans 14c92ac855 Mt Moon Rocket has Raticate again, Arbok in Game Corner
Minor upgrades in accordance with the recent KEP playtest.

The Mt. Moon Rocket with the Raticate is arguably one of the most iconic NPC trainers in Pokemon history and under no circumstances should it be cut. No matter what Yellow tells you.

Added a nice Arbok NPC to the Game Corner to make more use of the new overworld sprites I did. It's basically a guard for the attendant to its left - need some safety in casinos, y'know? Especially pachinko parlours...

I put the Arbok text in `text_2.asm` since it'll likely be used by other maps down the line. Or not, but it's good for architecture.
2023-06-05 13:00:20 +01:00
Llinos Evans 0aa26308f2 Bug fix, ball miss text enhancements
This fixes a bug where Meltans would invade Trainer Battles under the effects of the Mystery Box.

I also did some minor groundwork where the Candy Jar check is a function. I intend to change it so that catching a Pokemon would incur it too. I ended up with glitches when doing that, though.

The "ball miss" message is now modular, with a new message being spat out when not in the Safari Zone. The message talks about it being "too strong" and "breaking the ball", making it far more intense and matching some early anime scenes.
2023-06-04 10:52:00 +01:00
Llinos Evans 9c953339af Candy Jar finished
- Fixed a bug where the Candy Jar would load `wIsInBattle`'s 01, causing it to zero itself out every time.
- Fixed a bug where the Candy Jar would display `wMysteryBoxActive` due to the way `text_bcd` was being used. Replaced with `text_decimal` so it actually displays properly as well. No hex!!
- Added a test function for the evolution in the debug party because that's cool
2023-05-31 23:56:22 +01:00
Llinos Evans 228de2b718 Groundwork for the Candy Jar rework
This does everything except the incrementation.

If you defeat a Meltan, `wCandyJarCount` increments by 1, capping at 40. This is represented in-game as 10, going up to 400, simply by adding a 0 at the end. This, in effect, replicates the Meltan quest from Pokemon Go.

Once 40/400 is reached, the Candy Jar will become an evolution stone, evolving Meltan. Instead of consuming the Jar, the Candies inside are zeroed out.

Currently, the Candy Jar increments, but only once, thus why this is being committed on a separate branch. The bug appears to be at `engine\battle\core.asm`, line 842-861, likely 854-856. It's possible that it could be due to its position in WRAM, or that it's a `db` instead of a `dw`.
2023-05-31 13:37:55 +01:00
Llinos Evans 934f8adcac Mystery Box functionality
It was a long shot, but I did it! I added the Mystery Box from Pokemon GO! Very happy with the results here.

So here's how it works: When used, the game will replace Pokemon encountered with Meltan until the player leaves the map. This is sort of how it works in GO, with the player unable to close it and naturally petering out as they play.

Now multiple Meltan can be obtained, and in abundance, just like GO. Technically, someone could use this as a pseudo-Repel to replace hard encounters with easy ones.

Oh, and I'm pretty sure this happens vs static encounters as well, but it's awkward to account for I think that's hilarious, so...
2023-05-31 05:03:22 +01:00
Llinos Evans 253f8f4a22 FRLG Move Tutors
Still need to find out what I want to do with Body Slam, Swords Dance, and Thunder Wave. Slam/SD are on the Sevii Islands, and TWave is on an existing NPC who usually gives Self-Destruct.

Could possibly refactor the item receiving text.
2023-05-18 18:06:44 +01:00
Llinos Evans 0668db0ef0 Mt Moon Square House
This adds the Mt Moon Square House, faithfully recreated from GSC. I haven't yet sorted out the important details regarding the Crater Guard and such, though.

Making the map involved making a new desk tile and making house tile $36 be considered a counter tile. Hopefully there aren't any adverse consequences but I've never seen anything of that nature.

I noticed there are a ton of Clefairy text bits, so I refactored it to be a single line farcalled from `text_7.asm`. This also involved an interesting thing with the Pokemon Fan Club where the Pikachu fan has a Clefairy, so I fixed that too.

I figured that adding the dance was a little difficult right now, so we have Clefairys walking around instead.

I haven't figured out a good place to add the ladders yet (since there should be two entrances) but we'll figure that out eventually. It's plausible that we just make the Crater the southern warp, but I like how out-of-the-way the current one is.

Oh, and I fixed the Crater warps.

Overall, functional, but not finished.
2023-05-18 16:08:42 +01:00
Llinos Evans 36baa9e623 Boy/Girl option
This adds the boy/girl selection from later generations, using the pret tutorial and a spriteset from Pokemon Anniversary Red. I made some alterations, namely inserting the option later into the speech to be less clunky, and having the Nidorino become a Nidorina if you pick the feminine option.

I decided to make the third name option Seren, a common Welsh name for girls. It means "star", which is really cute! But...most people will probably say it's a Panel de Pon reference, which is cool too.
2023-05-13 00:08:39 +01:00
Llinos Evans 9bc7505195 Groundwork for James Bottle Caps
Currently, he doesn't deduct a Bottle Cap and he only fills out Attack and Defence. DVs are stored as a 16-bit address, so I need to find a way to make `a` work with it...
2023-05-11 08:43:19 +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
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 094869ab5e Citrine geography rework, Metal Coat
Lots of things here. Citrine now has its own tileset featuring content from the prototype asset leak. This includes new grass, signs, and so on. Lots of tinkering had to be done to make it look good, but it does! Collision and everything is done, but grass needs to animate properly. I'm committing as-is because making the grass animate is actually very difficult.

Also added the Metal Coat and fixed the issues with prior evolution methods - evo items first, level-up second. It is currently unobtainable.
2023-04-17 18:40:30 +01:00
MementoMartha a0cc8d52b0 Tauros.
Tauros.
2023-04-09 19:35:01 +01:00
Llinos Evans c75f968931 Update text_7.asm 2023-04-09 19:33:13 +01:00
Llinos Evans 77fd55ea49 Add regional trades, break trade limit
All over the place! S.S. Anne doesn't work properly though.

Thanks to Chatot4444 for bypassing the trade limit.
2023-04-09 18:56:19 +01:00
Llinos Evans 4389e86fd1 Revert "Revert "Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack""
This reverts commit e772de43d5.
2023-04-09 14:03:02 +01:00
Llinos Evans e772de43d5 Revert "Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack"
This reverts commit 9bf8886d4b, reversing
changes made to 8cf1ba9fc9.
2023-04-09 14:02:08 +01:00
Llinos Evans 3f6005f3f1 Refactor Item Constants
Alright, never put items after the floors. This is very, very bad, as it actually causes a myriad of problems whenever the game tries to assert the item list on its lonesome. Effectively, this has been adding floors. This caused the item descriptions to be offset by 21 spaces once you get to the TMs. The fact it worked before was a miracle.

Anyway, all considerations have been made when doing this, so it should all be just fine.

If you need to test if the items are ok, check the Up-Grade on Porygon, as it's the last in the list. Checks showed it was ok for me.

Also, Old Sea Chart now uses the localised name - Old Sea Map. This actually fits in-game, which is good.
2023-04-09 12:25:10 +01:00
Llinos Evans ed1ced807b Regional Trades!
- Regional trades now dummy out the "-A" thing etc so they look nice
- Added Celadon, Saffron, Viridian, and Vermillion regional trades
- Added Galarian Sidegrade trades to the S. S. Anne, but Perrserker and Sirfetch'd specifically don't work. I have zero clue why, as they work the same as the rest.
- Corrected grammar in the "Happy" text when you finish a trade
2023-04-08 01:05:15 +01:00
May Evans 57d79f43ed Up-Grade NPC
Seems to interact oddly with Saffron but I believe this is because of the way Team Rocket works. The event itself works fine.

Also added the Up-Grade, as before, Porygon was evolving via Trade.

Uses text referencing LGPE, and has a similar location.

Because of the sprite limit in Saffron, the Pidgeot NPC has been removed.
2023-03-29 23:47:26 +01:00
May Evans efe2d446a1 Item Descriptions!
Added using this tutorial:
https://github.com/pret/pokered/wiki/Item-Descriptions
Credit to Rangi for the baseline code!

Updated Candy Sack -> Candy Jar as discussed a while ago too.
2023-03-08 03:27:32 +00:00
May Evans 1d49a84b7e Framework for Regional Trades
This implements much of the stuff Martha wants for the regional forms.
- Alola forms have trades; version exclusives moved to Pewter
- Galar forms will be on the S.S. Anne to promote returning
- Regional form evos will be on the S.S. Anne possibly? Maybe something else.

Also contains a similar-to-LGPE trade quote. Extremely compressed quotes.
2023-02-24 11:42:38 +00:00
May Evans a85c26b7d3 LOTS of things
- Replaces the Old Rod with the Candy Sack, an item to evolve Meltan into Melmetal. Meltan and Melmetal aren't in yet.
- Improves Gym Leader and Elite Four AI by a lot. They still use items, they're just better. Fixes XSpecial use while we're at it; before, it didn't actually increase the stat...
- The Scarlet Book now takes up both shelves, one section for each Paradox Pokemon. I also moved the bookshelf so it looks nicer.
- Text in Celadon University has been reduced significantly, taking up less memory and being a bit more RBY-like. It has also been made more accurate (thanks to Daiginjo for translating my booklet!)
- The Magikarp researcher in Celadon University now gives TM Dragon Rage (no longer unused!)
- Added a guard for Mt. Moon Crater.
- Removed TrainerNamePointers, Blank Leader Name Code, and Dakutens/Hakutens using a guide published by YakiNeen.
- PP no longer uses a shitty graphic and is instead properly implemented into the font, optimising the status screen. Also displays in-battle which is kinda cool.
- Lorelei, Bruno, and Agatha now play the Gym Leader theme, not just Lance.

Still unsure how to fix Celadon University's trainers, all I know is a lot of the information should be taken from the Oak fight I did. The code is radically different and doesn't call trainer headers at all. You'll likely want to start from scratch.

The Mt. Moon Crater Guard's text is a little wonky, not sure what's up there. May have been from the way I accessed Mt. Moon in testing. Anyway, if you want to mess around feel free.
2023-02-19 06:25:33 +00:00
MementoMartha 2fc1f2250b A Christmas miracle! Martha got something done!
(and by that, she added Perrserker, Sirfetch'd, Mr. Rime and the Galar Birds, plus some team scaling and updated sprites for Politoed and Annihilape.)
2022-12-24 22:37:39 +00:00