Commit graph

3622 commits

Author SHA1 Message Date
Thorn Avery 190e3b461e Merge branch 'master' into mistress 2024-07-14 12:00:11 +12:00
Martha Schilling 3532e1f137 Facility floor tile change
This was a thing I made back in March, then got sidetracked by the Yoshi April Fool's thing, accidentally deleted and forgot about but now I've reimplemented. Oops.

This changes the tileset of Rocket Hideout, Silph Co. and Cinnabar Mansion to be much easier on the eyes, especially when holding the run button.
2024-06-13 09:00:31 +01:00
Thorn Avery 246bf80311 Merge branch 'master' into mistress 2024-06-03 18:30:15 +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 644abf1f2b Merge branch 'master' into mistress 2024-04-03 09:34:25 +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 d954a71b48 Merge branch 'master' into mistress 2024-02-29 08:54:16 +13:00
Martha Schilling dd5f64ad06
Merge pull request #45 from jojo-kep/master
fix PC in oak's lab glitching out
2024-02-28 10:56:59 +00:00
Martha Schilling 05aec76a83
Merge pull request #44 from LadyMisticus/patch-2
0 to a 5
2024-02-28 10:56:47 +00:00
jojobear13 65c8f70856 fix PC in oak's lab glitching out 2024-02-17 16:34:08 -06: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 6525b11a6c Merge branch 'master' into mistress 2024-02-05 08:50:16 +13:00
Martha Schilling 27bda7052d Two new(?) music tracks
I was gonna push the rest of the 1.3 stuff at the same time, but these are probably the biggest additions so I'm committing them now just to be safe.

- Made a variant of the Gym Leader battle theme that's pitched down a bit, using it for the battles against the Elite Four (basically what Diamond and Pearl did for its own Elite Four theme). Oak uses it too, given his apparent involvement with the Pokemon League as shown by the email in his lab and his history with Agatha.

- Also, a slower, heavier pitched version of the Rival's encounter theme has been added, which I'm thinking will play in his Pokemon League room if it gets used. This one currently can't be heard in-game, it's just in the files and will stay there until 1.3 comes out or until it gets cut.
2024-02-02 21:07:13 +00:00
Thorn Avery e05c12d6be Merge branch 'master' into mistress 2024-01-30 09:02:52 +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 b2d9542a45 update flake 2024-01-29 13:28:49 +13:00
Thorn Avery d28e9edc21 Merge branch 'master' into mistress 2024-01-29 10:11:59 +13:00
Thorn Avery e651ffbf84 update flake 2024-01-29 10:10:36 +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
Thorn Avery bf397e4f2a Merge branch 'master' into mistress 2024-01-22 08:46:08 +13:00
Martha Schilling 7cd95d1561
Merge pull request #43 from jojo-kep/master
Improved border block glitch fix and Cat vs Dog Beauty Fixes
2024-01-21 16:25:35 +00:00
Thorn Avery 72fb7ff6d4 Merge branch 'master' into mistress 2024-01-20 12:34:41 +13:00
jojobear13 7acb5b697f fixes for CatDog Beauty quest 2024-01-18 18:25:16 -06:00
jojobear13 9bad9fc109 Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack 2024-01-18 11:32:04 -06:00
jojobear13 00ad0119b1 improved fix for border block glitch 2024-01-18 11:31:38 -06:00
Martha Schilling aa6e47e4a3
Merge pull request #42 from jojo-kep/master
Fix for static wild mons not being hidden
2024-01-15 12:36:19 +00:00
jojobear13 fab1364343 Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack 2024-01-14 23:58:40 -06:00
jojobear13 7d13d34093 prevent static wild mon NPCs from refusing to hide after battle 2024-01-14 23:57:43 -06:00
Thorn Avery a034504c8b Merge branch 'master' into mistress 2024-01-15 06:44:25 +11:00
Martha Schilling 5119584aa0
Merge pull request #41 from jojo-kep/master
Additional fixes for non-severe issues
2024-01-14 17:13:01 +00:00
jojobear13 dd71684561 nicknaming gift pokemon won't make the overworld graphics glitch 2024-01-13 23:23:32 -06:00
jojobear13 3247fe7811 Damien comments on your box being full, not your party 2024-01-13 22:44:00 -06: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 aa1f39340c Merge branch 'master' into mistress 2024-01-14 09:38:27 +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
Martha Schilling 3e3b89552c
Merge pull request #40 from jojo-kep/master
band-aid fix for the border block glitch
2024-01-12 10:28:48 +00:00
jojobear13 649c306cf9 band-aid fix for the border block glitch 2024-01-12 04:10:32 -06:00
Martha Schilling e699a3db4b
Merge pull request #39 from jojo-kep/master
attempt to band-aide missable objects not hiding properly
2024-01-11 12:20:20 +00:00
Martha Schilling bd0618c38f
Merge pull request #38 from Deokishisu/patch-1
Fix Text Issues in Silph Gauntlet
2024-01-11 12:20:09 +00:00
jojobear13 6cb0f628c3 Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack 2024-01-10 23:52:41 -06:00
jojobear13 d88187600f attempt to band-aide missable objects not hiding properly 2024-01-10 23:08:56 -06:00
Deokishisu bfad8d8d08
Fix Silph Chief Text Issues
Removed a duplicate "for" in both of the Silph Chief's before battle texts. Additionally, in his loss text, moved the "I... I..." all to one line for the aesthetics.
2024-01-10 18:28:22 -05:00
Deokishisu 245d596854
Fix Capitalization in Silph Gauntlet 5F Text
In one of the trainer's after battle texts in Silph Gauntlet 5F, they start a sentence without capitalizing it. In this case, since it starts a new sentence, the word after the ellipsis needs to be capitalized.
2024-01-10 18:08:35 -05:00