Commit graph

3698 commits

Author SHA1 Message Date
Thorn Avery 053a69d1bd gitignore 2025-09-13 16:32:37 +10:00
Thorn Avery 684a075631 Merge branch 'mistress' into renewables 2025-09-13 16:31:16 +10:00
Thorn Avery 5a7c8fff16 nix update 2025-09-13 16:30:50 +10:00
Thorn Avery 72f77260be Merge branch 'master' into mistress 2025-09-13 16:25:28 +10:00
Thorn Avery 3a92cbfe21 Merge branch 'master' into mistress 2025-03-27 14:23:24 +11:00
Llinos Evans 0416121de9
Merge pull request #53 from ZetaNull/ZetaContent
Some checks failed
CI / build (push) Has been cancelled
Overworld enhancements + title Pink fix
2025-01-16 18:57:49 +00:00
Zeta_Null 0db6d0912a Revert some tiles to the RB versions. Only some though. 2025-01-16 13:45:50 -05:00
Zeta_Null d1de53bde2 ...No, put the yellow trees back. 2025-01-16 13:36:28 -05:00
Zeta_Null 2c6cf51077 minor revision 2025-01-16 13:33:22 -05:00
Zeta_Null 9fd86fe734 Overworld Edit + mild revision to Pink's title graphic 2025-01-16 13:30:23 -05: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
Llinos Evans 0167176d3b It seems some just do not notice these things until you put a gigantic neon sign down... 2025-01-09 01:37:17 +00:00
Llinos Evans e7d2a279ef
Merge pull request #49 from ZetaNull/diploma
LAST SECOND DIPLOMA FIX
2025-01-07 19:32:15 +00:00
Zeta_Null 6ccf7997ed Diploma Fix for Pink? 2025-01-07 14:14:20 -05:00
Llinos Evans 75c9adf431
Merge pull request #48 from ZetaNull/enby-maybe
Add Enby Player Option (Pink)
2025-01-07 12:49:24 +00:00
Zeta_Null 873dc89721 Pink mention in Readme 2025-01-07 02:42:03 -05: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
Llinos Evans 9707c2d7cb Precise credit for Green
Thanks Voliol!
https://www.pokecommunity.com/threads/kanto-expansion-pak.525646/post-10902513
2025-01-02 13:50:32 +00:00
Thorn Avery 02536e80ac Merge branch 'mistress' into renewables 2024-11-28 10:08:13 +11:00
Thorn Avery 3c4f7b0813 Merge branch 'master' into mistress 2024-11-28 10:07:47 +11:00
Llinos Evans 40555da36b
Merge pull request #47 from LadyMisticus/master
Fairy Type Rework
2024-10-18 04:29:33 +01:00
Misty 842a0032cd Fairy Type Rework 2024-10-17 19:04:52 -04:00
Misty 98cb7fcfe0
Merge branch 'PlagueVonKarma:master' into master 2024-09-03 17:44:22 -04:00
Martha Schilling 316c8bf7d3 Final README update
- Adds the Galarian Bird theme, crediting LuciShrimp.
- Removes the line mentioning Yellow Legacy's back sprites, as I decided against importing them in due to a bit of a style clash between them and the beta/custom sprites.
2024-09-03 20:53:07 +01:00
Llinos Evans 0d2614283a Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack 2024-09-03 17:46:06 +01: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 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 f9ff97cd9d Update play_battle_music.asm 2024-08-25 19:56:26 +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
Llinos Evans 1466465f63
Merge pull request #46 from Egon370/origin
squash the last two untranslated pokemon names in the readme
2024-07-28 18:04:08 +01:00
Thorn Avery 2195d60802 Merge branch 'master' into renewables 2024-07-14 12:00:25 +12:00
Thorn Avery 190e3b461e Merge branch 'master' into mistress 2024-07-14 12:00:11 +12:00
Misty 028f6ff1ff
Merge branch 'PlagueVonKarma:master' into master 2024-07-09 22:20:04 -04: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 6d4920da06 Merge branch 'mistress' into renewables 2024-06-03 18:33:13 +12:00
Thorn Avery 246bf80311 Merge branch 'master' into mistress 2024-06-03 18:30:15 +12:00
Egon370 a0cae560d5
Merge branch 'PlagueVonKarma:master' into origin 2024-05-17 12:26:10 -07: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
Egon370 7b980123fd
Update README.md 2024-04-26 09:13:57 -07: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
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 6c98d7dba8 Merge branch 'master' into renewables 2024-02-29 08:54:28 +13:00
Thorn Avery d954a71b48 Merge branch 'master' into mistress 2024-02-29 08:54:16 +13:00