Commit graph

795 commits

Author SHA1 Message Date
Thorn Avery 684a075631 Merge branch 'mistress' into renewables 2025-09-13 16:31:16 +10:00
Llinos Evans 602c63b03d Safari Zone Rest Houses now have PCs.
This uses some of the tech I made for the Day Care, since the House tileset had PCs in them. The Rest Houses now have slightly revamped maps to accommodate. Did you know these were unused?
2025-01-13 06:25:56 +00: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
Misty 842a0032cd Fairy Type Rework 2024-10-17 19:04:52 -04:00
Martha Schilling 8aa3247cd5 OOPS
- Fixed an issue where Giovanni's Room could not be exited (thanks pawtism for making me aware of this)
2024-09-02 09:29:54 +01: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 2c6fc43011 Title screen + Diploma improvements
- An interesting thing I decided to implement here; every time the title screen gets loaded, it loads a random choice between Red and Green, as well as Scream Tail and Sandy Shocks. This effectively gives 4 different starting title screens.

- Made the EXPN. PAK text on the title screen more centered.

- Green now appears on the diploma instead of Red if you're playing as her.
2024-05-15 20:46:36 +01: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
Llinos Evans dd7130c489 Groundwork for Pocket Lapras
This is still a bit glitchy:
- For some reason, unrelated text pops up after something is printed. I don't know why.
- Pocket Lapras needs to close the menu post-use. Probably very easy, something in engine\items\item_effects.
- The Pocket Lapras needs to default to Lapras as the text. This is a bit difficult as the item effect is actually used by Surf itself, so you may need to add a function that the Pocket Lapras loads before jumping to the real function (basically just loading the LAPRAS species ID for the text, ask me if you need help)
- Cycling Road needs to run the routine to force you onto the bike after using the Pocket Lapras, or simply have it check for if you're on a ForceBikeSurf map and yell at you. Both work.

I don't have time to finish this right now but it's at least obtainable.
2024-05-13 17:30:12 +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 9447cd71e0 Merge branch 'master' into renewables 2024-04-03 09:34:49 +13:00
Martha Schilling 2d24f19ba6 Revert "April Fools!"
This reverts commit 44304c57fc.
2024-04-01 10:54:56 +01:00
Martha Schilling 44304c57fc April Fools!
Go watch the video!

(Also, most of it is BS, all you need is a Fire Stone and any Dragonite.)
2024-04-01 10:54:05 +01:00
Martha Schilling cf504c7f8f 1.3 prep: Part A
Uploading some of the 1.3 stuff to begin with, mainly the changes that are fully finished so far.

- After earning all 8 badges, the trainers in Celadon University get a decent level increase, allowing for a much better grinding spot between Victory Road and the Pokemon League.

- A handful of changes to move animations, credit to wrulfy for implementing some of these in their Carmine Red hack:
     - Struggle has the user bouncing up and down similarly to Splash, rather than shaking back and forth.
     - Slam has the user move forward while attacking.
     - Mega Kick has the user move back, then lunging forward while attacking.
     - Jump Kick has the user move forward while attacking, as well as a sound effect change.
     - Horn Drill uses a unique animation of a rotating star effect, as well as darkening the screen.
     - Both confusion-inflicting status moves show birds circling the enemy.
     - Hyper Beam is slightly slower, and shakes the screen after the hit.
     - Drill Peck uses the same circling star animation as Horn Drill.
     - Solar Beam has a 'gathering energy' effect while lighting up the screen.
     - SmokeScreen is a lot faster.
     - Skull Bash shakes the screen and moves the user horizontally while attacking.
     - Hi Jump Kick made slightly faster.
     - Dazzling Gleam lights up the screen and has been made slightly longer.
     - Acid Armor has been given a proper animatio, and no longer makes the user invisible.

- It's now possible to Escape Rope out of the SS Anne and Silph Gauntlet 3F.

- Changes made to a handful of Victory Road and Silph Gauntlet trainer parties.

- Slight level buffs to the Elite 4 initial matches, and significant buffs to their rematches.

- Silph Gauntlet Gym rematches have been increased by a few levels, and Chief has been similarly buffed.

- Slight encounter tweaks to Route 23

- Level buffs to Victory Road's wild encounters

- Minor text fixes

-
2024-03-09 11:34:22 +00:00
Thorn Avery 6c98d7dba8 Merge branch 'master' into renewables 2024-02-29 08:54:28 +13:00
Misty b67b37a4df
0 to a 5
Disarming Voice has 10PP instead of 15PP, simple mistake, simple fix!
2024-02-16 17:19:50 -05:00
Thorn Avery e88c8a6db0 Merge branch 'mistress' into renewables 2024-01-30 09:03:46 +13:00
Martha Schilling 9c0962690b
MMMMTMA
Short for: Martha Missed More Motherfuckin’ Tradeback Moves Again!

Anyway, Dragonite can Fly now.
No, it didn’t get that naturally in Gen 1.
Yes, you’re right in that it makes no sense.
Yes, I do think I’m going a bit crazy, in fact.
2024-01-29 13:55:42 +00:00
Thorn Avery 94ef32cb10 portable pc 2024-01-29 16:43:33 +13:00
Martha Schilling cc3640e6c7 Sorry, Umbreon fans
It still gets to keep Psychic, but it's a tradeback move rather than by TM. Mainly citing balance reasons and also to keep the Eevees more consistent with regards to TM learnsets.
2024-01-28 20:02:55 +00: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
jojobear13 939f034d5a account for softlock in volcano when saving next to moltres 2024-01-13 21:48:38 -06:00
Martha Schilling 0c650630e0 Post-release bugfixes: Batch 2
This commit fixes the following bugs:

- Viewing the Town Map in Viridian Pre-Gym would show the player as being in Cerulean.

- Psychic, Psywave, Night Shade and Dazzling Gleam wouldn't shake the full screen

- Okay, NOW it's impossible to trap yourself in Cinnabar Volcano.

- Getting the Vermilion Beauty gift would lock you out from getting the Silph Co Lapras gift later.

- Text fixes
2024-01-12 12:33:50 +00:00
Martha Schilling 9080a74da2 Post-release bugfixes: Batch 1
This commit fixes the following bugs:

- A guy in Celadon University was stuck in a tree due to being placed on the wrong tile.

- It was possible to walk out of bounds in Mt. Moon Crater due to buggy collision near the bottom of the map

- Hi Jump Kick had a slightly glitched animation

- It was possible to walk into a specific rock in both Cerulean Cave and Garnet Cavern. This was a vanilla bug too, but I'm fixing it proper now.

- There was no signpost outside Bill's Lighthouse where there should've been.

- Fixed two errors in the README

- The Fissure TM was not purchasable at the Citrine Rocket house

- Even if you had picked one of the original starters, you could still get the Charmander and Squirtle gifts as the NPCs would show up regardless.

- Trying to get the Squirtle gift with a full party and box would lock you out from getting it

- Fixed a text issue in Celadon Uni where the professor states the wrong TM

- Fixed two text issues in Silph Co
2024-01-09 23:00:18 +00:00
Martha Schilling 573f9083c0 All TMs are now renewable
Added the TMs that weren't already available in either Celadon or Citrine to Citrine.
2024-01-07 18:34:07 +00:00
Martha Schilling a031c1b3b6 Goodbye, dev door 2024-01-07 15:04:36 +00:00
Martha Schilling 8fd91dcb90 More wild data changes
Already added to the spreadsheet. Did you know that Seafoam Islands' water didn't give wild encounters until Yellow?
2024-01-07 14:12:28 +00:00
Martha Schilling 6bd93e635c Slight postgame encounter balancing 2024-01-07 12:42:00 +00:00
Martha Schilling 88da32d39d Update trades.asm
No, THIS is my last commit for tonight.
2024-01-07 01:51:06 +00:00
Martha Schilling 6434c918f0 Moved some trades
That's my last commit for tonight, I swear!
2024-01-07 01:50:02 +00:00
Martha Schilling a25f681875 "One more commit before bed," she said. 2024-01-07 01:30:56 +00:00
Martha Schilling c9044a3f48 Slight Galar Bird rebalance
Took them down a bit from Level 70 to 65, and mostly increased their learnset levels, so going to Citrine first to catch them shouldn't make Silph Gauntlet WAY easier. In order to stay consistent with the number of moves they were each given, I've added Psychic to Garticuno's level up learnset.
2024-01-07 01:02:56 +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 f9bbabbcca WE ARE TEAM ROCKET, YOU CANNOT BEAT US
- Adds a slightly remade version of the Rocket battle theme that plays when fighting Rocket Grunts, Jessie & James, and Giovanni (1 and 2)

- Giovanni 3 and Chief now share a new battle theme composed by myself and LuciShrimp, which is a slower, more intimidating remix of the regular Rocket fight theme.

- Gave Giovanni 3 his own trainer class, allowing for better AI routines and smarter move choices.

- Removed Giovanni's name from the Viridian City Gym statues to keep his identity a further secret. It also made more sense than in vanilla.

- Gave the postgame Morimoto fight a better selection of moves.
2024-01-06 17:11:31 +00:00
Martha Schilling c8f27d8bce More (very small) AI improvements
- Fixed a bug where the Elite 4 wouldn't use Full Restores. Apparently the game only allows one item per trainer.

- Gave Oak and Chief custom AI found from proto assets (then changed to be less ass)

- Small amount of balancing

- Minor text fixes

- Figured out roughly how the current high-level AI works (Stat boosting moves are only used sometimes on the first turn, Recover is only used sometimes when below half health, otherwise just attack with a move that isn't ineffective. More testing needed for stat lowering moves and things like Barrier)
2024-01-06 00:00:18 +00:00
Martha Schilling 8a59ed4b8e Mr. Rime had the wrong Special for HOW long?
Mr. Mime's 100 Gen 1 Special became its Special Attack in Gen 2

Mr. Rime has 110 Special Attack and 100 Sp. Def

Oops
2024-01-05 15:59:45 +00:00
Martha Schilling e6763371e4 AI Improvements
This fixes some of the issues with the current AI system to make them better. In short:

- Most Trainers should correctly recognise when a move is not very effective, and not use it. If they have a supereffective move and a regular-effective move, they will slightly prioritise the supereffective one, but not always use it like in regular RBY. This prevents the Lorelei softlock, for example.

- Trainers won't attempt to set status effects on Pokemon that already have one, won't try recovering at full health, and won't attempt to set up multiple Reflects or Light Screen

- Certain high-level trainers will recognise when a Pokemon does not have a status, and will try to inflict one if so. This makes Agatha's, Erika's and Koga's team types much more effective.

- Youngsters and Cue Balls no longer pick moves randomly and will actually give it some thought

- Brock and the Engineers now recognize type effectiveness, Students do not given how early they're encountered.

- General improvements to move choices for all Gym Leaders, E4 and Shinjuku Jacky.

We're almost done.
2024-01-05 13:59:27 +00:00
Martha Schilling 185e598a2e PureRGB move enhancements + Nasty Plot and Fake Tears animation fix
Just a bit more to go! Added improved animations for the following moves, mostly taken from Vortiene's PureRGB hack:

- Struggle (user now shakes before attacking)
- Fire Punch (added sound effects)
- Ice Punch (added sound effects)
- ThunderPunch (added sound effects)
- Swords Dance (increased duration by adding an unused subanimation)
- Fairy Wind (changed sound effect)
- Jump Kick (much more detailed, user's sprite dips down before attacking, and the hit is carried upwards)
- Rolling Kick (user now shakes before attacking)
- Thrash (user now shakes before attacking)
- Iron Head (changed sound effect)
- Poison Sting (added new graphic that looks like a needle being fired at the opponent)
- Twineedle (added new graphic that looks like a pair of stingers being fired at the opponent)
- Pin Missile (added new graphic that looks like a needle being fired at the opponent)
- Hydro Pump (the first half of the attack now looks more like a blast of water instead of two rising colums of water)
- Ice Beam (screen briefly brightens when used, added sound effects)
- Blizzard (added sound effects)
- Aurora Beam (screen briefly brightens when used)
- Submission (much more detailed animation that shows the user falling back to the ground after the attack)
- Draining Kiss (added Lovely Kiss' animation to the first half of the attack so it wasn't a clone of Absorb)
- Growth (increased duration by adding more subanimations)
- PoisonPowder (the palettes temporarily darken slightly when used)
- Stun Spore (the screen temporarily lights up slightly when used)
- Sleep Powder (the screen temporarily lights up slightly when used)
- Dragon Rage (increased duration by adding more subanimations)
- Rock Throw (changed sound effect slightly)
- Agility (user now shakes when used)
- Night Shade (the screen inverts colours temporarily when used)
- Recover (changed sound effect slightly)
- Focus Energy (reused its unused animation)
- Egg Bomb and Magnet Bomb (sound effect changed)
- Spike Cannon (added new graphic that looks like a needle being fired at the opponent)
- Amnesia and Nasty Plot (completely new animation that doesn't reuse the confused animation)
- Kinesis (completely new animation, looks more like a psychic move now)
- Hi Jump Kick (much more detailed, user's sprite jumps up before attacking, then lands afterwards)
- Dream Eater (changed sound effect, now has HP drain animation
- Sky Attack (changed sound effect and subanimation)
- Dazzling Gleam (the screen now turns wavy like Psychic after the initial flash)
- Hyper Fang (the screen flashes for a moment when the attack lands)
- Tri Attack (added the fire, ice and electric elements present in later animations, but note that the move still has no secondary effect)
- Fake Tears (completely new animation that involves the user literally shaking and crying)
2024-01-03 21:41:24 +00:00
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