Commit graph

517 commits

Author SHA1 Message Date
Thorn Avery 02536e80ac Merge branch 'mistress' into renewables 2024-11-28 10:08:13 +11:00
Llinos Evans 347ee31852 Fix Oak's Lab pikavee starterballs not disappearing
This was actually really really really easy to fix and I have no idea how it never got fixed

This finishes KEP 1.3.
2024-09-03 17:46:04 +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
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
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
jojobear13 65c8f70856 fix PC in oak's lab glitching out 2024-02-17 16:34:08 -06:00
Thorn Avery 1bef80b2c8 Merge branch 'mistress' into renewables 2024-01-29 10:12:19 +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
Thorn Avery e031994f50 Merge branch 'mistress' into renewables 2024-01-22 08:46:22 +13:00
jojobear13 7acb5b697f fixes for CatDog Beauty quest 2024-01-18 18:25:16 -06:00
Thorn Avery b9b0ea0301 Merge branch 'mistress' into renewables 2024-01-15 06:44:40 +11:00
jojobear13 e72fd48d30 can select a pokeball without having to talk to koichi a second time 2024-01-13 22:23:45 -06:00
jojobear13 939f034d5a account for softlock in volcano when saving next to moltres 2024-01-13 21:48:38 -06:00
Thorn Avery 65e94896d1 Merge branch 'mistress' into renewables 2024-01-14 09:41:22 +11: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
jojobear13 4581a9487f added backup script to make sure brunswick trail cactus gets hidden 2024-01-10 04:15:47 -06:00
Thorn Avery febf239b0c Merge branch 'mistress' into renewables 2024-01-10 10:12:15 +11: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
Thorn Avery 5604c332f7 Merge branch 'mistress' into renewables 2024-01-08 08:35:22 +11: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 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 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 a486ec7657 Update LancesRoom.asm
this always bugged me so I'm importing this small change from PureRGB
2024-01-04 22:49:02 +00:00
Martha Schilling a2acee24e7 Music fadeout before Champion fight 2024-01-04 22:18:45 +00:00
Thorn Avery 65be95e494 Merge branch 'mistress' into renewables 2024-01-03 15:13:35 +11:00
Martha Schilling 0da7a93ca6 Solving Mew's identity crisis 2024-01-02 15:19:56 +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
Martha Schilling 443277ffc8 WE
ARE

SO

BACK!!!!!
2024-01-01 21:15:44 +00:00
Thorn Avery 95f83287fe Merge branch 'mistress' into renewables 2024-01-01 13:11:44 +11: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 d20207f012 Salesman 'Obtained item!' text
Yeah for some reason the salesman didn't actually tell you that you got the item. Meanie.
2023-12-30 20:10:11 +00:00
Martha Schilling 980664075b Yay!
Fixed a glitch again!
2023-12-30 16:29:55 +00:00
Thorn Avery 967e835aa3 Merge branch 'mistress' into renewables 2023-12-30 12:55:23 +11:00
Martha Schilling 8893f847a0 HAHAHA FUCK YOU YUJIROU
WE WIN

PRAISE BE TO RAINBOW METAL PIGEON, OH MY GOD
2023-12-29 23:21:42 +00:00
Martha Schilling 1eed8f03d5 Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack 2023-12-29 22:37:28 +00:00
Martha Schilling 51185204d0 One more bug down! 2023-12-29 22:37:14 +00:00
Martha Schilling 3b3b95d41f
Merge pull request #32 from thornAvery/master
fixed battle tent rewards
2023-12-29 22:26:37 +00:00
Martha Schilling da4082bca3 Update ViridianPreGym.asm
This makes it so you don't miss the Bottle Cap gift that Yujirou gives you, even if you beat the Elite 4 before him. There's a similar issue with the Fighting Dojo where the same thing happens but I'm less sure on how to fix that one...
2023-12-29 20:34:45 +00:00
Martha Schilling 9b4a9d5839 Yujirou is now marginally less of a twat
He now gives you a Bottle Cap when you win, but still crashes the game when you lose for some reason...
2023-12-29 19:11:11 +00:00
Thorn Avery 4c2b518188 fixed battle tent rewards 2023-12-29 20:16:26 +11:00
Martha Schilling 5760e27617 Fixing the Brunswick Glade NPC bugs
Almost there...
2023-12-28 21:40:05 +00:00
Thorn Avery 8ccfe3e992 Merge branch 'mistress' into renewables 2023-12-26 11:49:12 +11:00