Commit graph

3389 commits

Author SHA1 Message Date
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
MementoMartha 6d4b0f7a4e Small edits
- Attempted to fix the Mt. Moon J&J encounter (did not work, will look at the script file)

- Fixed a few bugged warps relating to Mt. Moon Square/Crater

- Fixed the credits text layout (just need to figure out how to decrease the delay between them, so it still matches the music...)

- Added the Crater guard back

- Changed the silhouettes in the credits to be more prominent Pokemon (Leader and E4 aces, plus some postgame teasers in Omega for the Chief fight, and the legendary wings)
2023-05-25 23:54:19 +01:00
Martha Schilling 4997045bae
Update parties.asm
Should be nearly all the gauntlet trainers done now, just a few more that need to be finalised.
2023-05-24 15:47:52 +01:00
Martha Schilling 939800e5ff
Update parties.asm
Adding a couple more Gauntlet parties, will properly refine soon
2023-05-23 12:08:06 +01:00
Llinos Evans 0c6903588f rock tunnel bug fixes
Fixes the youngster facing direction
Makes the Jr Trainer not walk through walls (hopefully)
2023-05-20 17:03:59 +01:00
Llinos Evans 48b25069f8 Fix Mt Moon Square NPCs, new Battle Tent system
This fixes the issue with Mt Moon Square's NPC text and changes the Battle Tent to a continuous system.

The Battle Tent's new system circumvents the issue with wBTStreakCnt while providing the player with more agency. They'll get constant prize money after each battle and can abandon the challenge at any time. It may feel more grindy but in my opinion works just as well.
2023-05-20 04:57:46 +01:00
Llinos Evans 4262a0de0d Rock Tunnel fossils
I am not sure why the fossils don't show properly at the moment - it isn't related to going past $FF, as the Old Amber shows.

Dome and Wing specifically don't show properly and need fixing down the line.
2023-05-19 16:57:36 +01:00
MementoMartha db26373a0a Encounter table changes
Altered all the 'bird dungeons' to be consistent, as well as changing the encounters themselves a bit. Rhydon being in the volcano is a reference to Blaine's in the anime.
2023-05-19 16:47:43 +01:00
MementoMartha b70e7b5fb5 A few updates
- Changes Bill's Garden to be a more fitting Overworld-tileset map

- Gives Cinnabar Volcano a unique palette, being a slightly less-bright version of the RedMon palette

- A few small changes/improvements to the Rival teams

- Reduced wild encounter levels in Silph Gauntlet a little

- Adds a 100% chance for a Magmar encounter when fishing in the Cinnabar Volcano lava

- Hides more 'secret' areas off the Pokedex area listing, namely Mt. Moon Crater and Faraway Island

- Improves Jabetta's sprite a little
2023-05-19 16:17:44 +01:00
Llinos Evans 9a88543f19 Tweaks
Fixed the Rock issue (thanks frrfy)
Changed the Slowbro text to reference a move it actually learns
2023-05-19 15:48:02 +01:00
Martha Schilling dc439c36cf
Update CeruleanCity.asm
god why do I always find something worth changing immediately after the previous commit
2023-05-19 10:16:34 +01:00
Martha Schilling f881c345c7
Update CeruleanCity.asm
oops the sign outside needs changing too
2023-05-19 10:12:55 +01:00
Martha Schilling 5908a8c082
Update BikeShop.asm
So...for some reason they never bothered to localise the cool name for the bike shop in Cerulean. I wanted to restore it.
2023-05-19 10:08:17 +01:00
Llinos Evans 7fec4d9357 Lots of small tweaks
- Gave nicknames to the Galar Evolution trades, they're a bit different to regional variants n such
- The Throw Rock command now only increases flee chance by 50%. It seems like it may be a little TOO strong though, bit curious.
- Changed a bit of text here and there
- Made CHIKUCHIKU trade accessible, still need MICHELLE
2023-05-19 03:21:00 +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 9576b04563 Decrease flashing damage animation loop
In vanilla RBY, Pokemon flash 6 times when taking damage from moves like Tackle or Fury Attack. This is really slow and sells the impact way too much, drawing out battles by a lot. I tried 3 but it looked just slightly too fast, so I went with 4.
2023-05-17 23:46:07 +01:00
MementoMartha 7e439981a2 A few tiny changes
- Gave Lorelei's room the cyan palette

- rearranged gym leader parties a little

- slightly better Tsubomitto sprite
2023-05-17 22:26:42 +01:00
Martha Schilling 0e57ed01ce
Update victory4.asm
Removes the fanfare at the start to make it usable as a map theme. Seems to be identical to GSC's Mt. Moon Square but I could be wrong...
2023-05-17 15:59:33 +01:00
Martha Schilling 201c1cd7a3
Update leafeon.asm
Formatting :P
2023-05-17 15:40:01 +01:00
Martha Schilling c273709004
Update evos_moves.asm
Gives the original Eeveelutions their Yellow learnsets (albeit fixing the Haze/Mist glitch that Vaporeon has) to accommodate Eevee being a starter. Also gave Purakkusu and Umbreon some of the moves we added last because I forgot lol
2023-05-16 11:11:06 +01:00
Llinos Evans 082e581d81 Mt Moon Square, Jessie & James Backport
This adds Victory4 in its original form over Mt. Moon Square's music, which could possibly have the initial jingle removed. I noticed the GSC version was being used, which wasn't ideal.

Mt. Moon Square's map is added, with accessibility where the Crater's originally was (for now). One warp on the south part of the map doesn't go anywhere (actually it's a glitch city). The shop and Clefairy event aren't done yet.

The Mt. Moon Crater Guard has been removed with the pretence of re-adding him on the Square map once it's finished.

I'm trying out having the text in the raw script file without farcalling, which seems to be more optimal than doing it the way the devs originally did it. The Battle Tent does this too.
2023-05-15 19:26:42 +01:00
Llinos Evans b03e9ffc6e Credit additions
This modifies the credits to have a KEP staff version. It's a little awkward aesthetically! But this should be used and expanded on in the future - people don't read readmes, so the people who've helped should be credited.
2023-05-15 18:01:28 +01:00
MementoMartha 48c76a6dd1
Update SSAnne1F.asm
Martha casually pushing the commits one file at a time because she's a forgetful goof
2023-05-15 11:59:34 +01:00
MementoMartha 47a0c24d59
Update SSAnne2FRooms.asm
oops, this needs changing as well
2023-05-15 11:56:04 +01:00
MementoMartha 3596dbefec
Update SSAnne2FRooms.asm 2023-05-15 11:54:57 +01:00
Llinos Evans 6b954dbfd1 remove jack from the tent
he's def being used somewhere else, so maybe junior can be here looking pretty instead
2023-05-15 09:45:45 +01:00
Llinos Evans 3894953698
Merge pull request #13 from PlagueVonKarma/BattleTentPort
Battle Tent Port
2023-05-14 20:39:13 +01:00
Llinos Evans 7ebb4d02a4 Battle Tent done!
So it turns out that the code used in Factory Adventure *or* the TPP Anniversary Repository, by all accounts, should not actually work. Like, no, really, it ends up loading 0xFF as code, thus why it would always rst38. It just...doesn't...do anything. My friend Enigami, who figured out the issue, described the function as being "half-finished".

We came up with a solution that results in less functionality - now it needs a free box - but it results in less load times, so maybe it's just better this way. I doubt many people will catch that many Pokemon unless they were shooting for a living dex, which is unfeasible in its current state anyway.

I considered putting Bottle Caps in here, but it felt like making the game too grindy, so I changed it to just be in the Battle Tent shop with a very high price.
2023-05-14 20:28:37 +01:00
Llinos Evans 0397961a8b hmmmm m 2023-05-14 09:13:05 +01:00
Llinos Evans 211e92ddeb bits and bobs
fixes an issue viwalls pointed out and tweaks chief's monologue
2023-05-14 08:59:12 +01:00
Llinos Evans 0bda742995 tweaks
still struggling with the removepokemon bit...
2023-05-14 08:58:34 +01:00
Llinos Evans e02a4b54ef Update CitrineCity.asm 2023-05-13 20:27:36 +01:00
Llinos Evans be7a5bf66a comment on implementation 2023-05-13 20:25:12 +01:00
Llinos Evans 8e10d26336 Scripted losses
Now the last issue is making this not crash when restoring the player's team. Very odd...
2023-05-13 20:13:40 +01:00
Llinos Evans 4de0a13543 So it "works"...
This now, technically, works.

However, the Battle Tent was seemingly made with the assumption trainers are Pokemon, which our hack has moved from. I've made it so it can load it as a trainer battle properly, but you will deathwarp. I need to implement a scripted loss system.
2023-05-13 19:07:16 +01:00
Llinos Evans 8735785fd5 fix surf sprite issue
what a SILLY mistake that tutorial makes.
2023-05-13 18:36:43 +01:00
Llinos Evans e7c6cc9dcc Minor tweaks
Still hangs, just makes the warp more player-friendly.
2023-05-13 18:14:17 +01:00
Llinos Evans 64dea915e8 Fix the party selection bit
I am shaky on using this area of WRAM but it seems to make the party menu work as desired.

Crashes when trying to load the opponent.
2023-05-13 17:47:15 +01:00
Llinos Evans 6d705fb489 Update sgb_border.png 2023-05-13 08:20:18 +01:00
Llinos Evans e28021b3db New SGB border
I altered the border to use RGBY sprites only. They're taken from various sources; the game corner, beta material, and so on. I directly downgraded Jigglypuff, Clefairy, Pikachu, Oddish, and Bulbasaur, which results in a really cool pre-GSC feel.

Also, fixed the Voltorb sprite. Had a palette thing left.
2023-05-13 08:14:59 +01:00
Llinos Evans deb6e2ecf2 Enhance readme, move CeladonU trainers
Some Celadon University trainers were in slightly inconvenient locations, making a straight line to the door clunky.

Also, generally made the readme more useful.
2023-05-13 05:00:05 +01:00
Llinos Evans ec61a039b8 Battle Tent Port
This is...most of the stuff necessary for the Battle Tent to work. I've faithfully restored most things so far, including doing a few grammar tweaks.

Main issue is that we get a really strange softlock when the Pokemon selection menu comes up. Not sure why, but point is, it can't progress to the next bit for debugging like this. Committing now to ask for assistance.
2023-05-13 02:50:31 +01:00
MementoMartha cdb00af812 A few minor changes
- Made Gym Leader levels more consistent

- Updated sprites, including a complete redo of Espeon's (based off the Gold sprite)

- Fixed an issue where Blue would have an incorrect team

- Changed Celadon Gym trainer text to accomodate for being a girl
2023-05-13 00:41:07 +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 3b16404a50 Populate Citrine City
This commit adds NPCs and signs to Citrine, doing some significant worldbuilding in the process. I considered adding an event where Oak greets you like how the Magma/Aqua Admins do on the ORAS Battle Resort, but it seemed a little too on-the-nose, y'know?

There was an issue where you wouldn't be walked out of doors automatically, which was quite immersion-breaking. That was because the door tile IDs weren't defined - this is fixed too.

Some map elements have been altered to facilitate the new changes, and obviously, some map sprite slots have been filled.

Importing and changing the Battle Tent is most likely my next task.
2023-05-12 22:30:51 +01:00
MementoMartha 2ec8bab272 Update sylveon.png 2023-05-12 06:23:06 +01:00
Llinos Evans e6a74546c2 Functional Hyper Training!
There are ways this can be improved (SFX, menu message, insta-recalc stats), but this finishes the Hyper Training functionality.

Talk to James, give him a Bottle Cap, he boosts your DVs to max, and then he deducts a Bottle Cap.

Notable that vanilla vitamins don't recalc stats immediately as well, so maybe the recalc bit isn't necessary.
2023-05-11 20:32:46 +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 76fc5f737e
Merge pull request #12 from pret/master
Make wCurrentBoxNum a byte instead of word (#414)
2023-05-11 06:36:23 +01:00