Commit graph

155 commits

Author SHA1 Message Date
Llinos Evans a91b7fd2a1 Rock Smash, but good
Adds new rock smash wild data categories. Somehow, the functionality for this existed in-game, they just...didn't use it.
2023-11-01 21:23:39 +00:00
Llinos Evans 26c5ede84f Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2023-11-01 20:31:37 +00:00
Llinos Evans 038970363f Kurt instamakes balls now 2023-11-01 20:31:28 +00:00
Zeta_Null 5e6ac1d2f8 Sinjoh Ruins Theme improvements 2023-11-01 16:22:41 -04:00
Zeta_Null d9bc71f5de Sinjoh Ruins test track!
Not broken up about it if we decide to just go with a demake of the original song for the sinjoh ruins but if we want a more original one here's a thing I slapped the fuck together lol

Currently plays in the Debug Room.
2023-11-01 00:38:02 -04:00
Zeta_Null e8482b7991 DEBUG ROOM!! 2023-10-30 17:44:30 -04:00
Zeta_Null bb95a16dcc Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2023-10-30 12:04:48 -04:00
Zeta_Null 1a919e157a Partial pewter museum fix attempt (still broken. Can't tell why) 2023-10-30 12:04:41 -04:00
thornAvery b0ae5b0c6d
Pokegear Map Fix + Minor Fixes (#13)
* pokegear townmap shows correct region + doest OOB

* fixed route data
2023-10-30 16:01:11 +00:00
Llinos Evans c37e192fda
Merge pull request #12 from LadyMisticus/master
Stretchy Vines, Stretchier Tongues!
2023-10-29 22:25:19 +00:00
Misty 5d1bf81944 Merge remote-tracking branch 'upstream/master' 2023-10-29 18:08:50 -04:00
Misty Violet d76255ec9f Stretchy Vines, Stretchier Tongues! 2023-10-29 17:57:22 -04:00
Llinos Evans 0f76cfc488 17 new Pokemon!
New Pokemon have been added and distributed across the region.

Leafeon
Glaceon
Sylveon
Coinpur - Night time on early routes over Rattata. I want to make an argument for branch evolving into Moibelle at night or if female.
Perrserker - Unobtainable for now.
Gentlarva - Ilex and Viridian Forest.
Pupal - Evolve Gentlarva.
Carapthor - Evolve Pupal.
Kotora - Mt. Mortar outside, Viridian Forest.
Gaotora - Evolve Kotora
Gorotora - Evolve Gaotora
Raitora - Evolve Kotora
Bittybat - Union Cave and other early routes.
Paraspor - Ilex & Viridian Forest
Vulpiii - Route 36, Burned Tower 1F
Annihilape - Trade Primeape
Pupperon - Route 36, Route 37, Burned Tower B1F
2023-10-29 21:41:15 +00:00
Llinos Evans 8800739052
Merge pull request #11 from LadyMisticus/master
The Big Bad Bugs and the Lunar Lord!
2023-10-29 17:39:42 +00:00
Llinos Evans e150889975
Merge branch 'master' into master 2023-10-29 17:39:31 +00:00
Llinos Evans dafc4aada7 Gorochu
This is the first use of the placeholder graphic. Works like a charm - copypaste the folder whenever you add something new.

This required me to change the layout.link for cries but it seems to work just fine. Earthtron cry is now available for use on other Pokemon, which I think could be neat for Shi-Shi.
2023-10-29 14:13:11 +00:00
Llinos Evans ca8608a0c9 Restore Remoraid to Route 44
Free my mans

also why did they keep this unused lmao
2023-10-28 20:06:48 +01:00
Misty Violet 672cefbd96 The Big Bad Bugs and the Lunar Lord! 2023-10-28 01:46:11 -04:00
Llinos Evans 56bf3ef2b0 Finish Lake of Rage "town"
Well, sort of. There's still a lot you can do with Pryce's House, it needs more things.

I want to make it so Pryce only appears when the Red Gyarados has been defeated. Maybe he can give a TM or something too.

This commit does the following;
- Fix the weird landmarking because I was a dumb stupid idiot.
- Adds all the relevant signs.
- Adds Pryce's House over where the gym was. Just a cute, quaint little place.
2023-10-28 00:03:23 +01:00
Llinos Evans c1fa88db2a Running Shoes, new readme, Munchlax
This adds a readme with credits so far. Make sure to keep this updated so everyone knows what is and isn't done!

We also get the Running Shoes feature from the tutorial, finally making debugging bearable given how laggy Crystal's overworld can be at times.

Oh, and Munchlax.
2023-10-27 21:59:33 +01:00
Llinos Evans bd6b73b04b
Merge pull request #10 from MementoMartha/master
oops
2023-10-27 21:06:15 +01:00
Martha Schilling 8ba45aee11
Merge branch 'ZetaNull:master' into master 2023-10-27 21:04:15 +01:00
Martha Schilling 89e7506f05 martha un-fucks up
this one line, these TWO CHARACTERS, accidentally getting deleted by me caused the whole thing to break. They are now back.
2023-10-27 21:04:03 +01:00
Llinos Evans 721b6a5d8f
Merge pull request #9 from MementoMartha/master
Walking Wake and the Guardian Beast!
2023-10-27 19:51:08 +01:00
Martha Schilling 143fa7f521
Merge branch 'ZetaNull:master' into master 2023-10-27 18:06:34 +01:00
Martha Schilling 245680d2ca Update evos_attacks_johto.asm 2023-10-27 18:05:55 +01:00
Llinos Evans 5669dce327 Kanto level buffs
This makes Kanto Pokemon be ~L30 minimum, then L40 from L20 onwards, then L50 from L30 onwards.
2023-10-27 17:49:00 +01:00
Llinos Evans 4c292d29b1 Route 45 encounter update
Increases frequency of Phanpy encounters to be morning/day and replace Geodude in that time span. Adds 5% Jigglypuff from Silver that was removed (you'll see a lot of silver additions, it was a very based game)
2023-10-27 17:28:18 +01:00
Martha Schilling 37fbf884f3
Merge branch 'ZetaNull:master' into master 2023-10-27 17:09:09 +01:00
Llinos Evans 3e6878efe6 Preliminary wild data enhancements
Still need to fix the Headbutt trees and fishing groups, but this is a great start.

At a glance:
- Houndour and Slugma are now in the Burned Tower. Magby is also now featured as well as Magmar.
- Ilex Forest now uses mostly Johto Pokemon, including Yanma, Ledyba, and Spinarak.
- Larvitar is now in Mt. Mortar, and Marill is now an all-day encounter.
- Sneasel is now an all-day encounter in the Ice Path.
- Misdreavus replaces Gastly outside of Sprout Tower at night. That's Routes 31, 32, and 36.
- Murkrow is now a 10% encounter on all the routes near Ecruteak City. That's Routes 38, 42, and 37.
- Route 38 also has the all-day Snubbull encounters from GS, and uses Silver's data to have a Meowth-Moibelle dichotomy later.
- Route 42 also uses Gold's wild data, featuring Mankey, Flaaffy, and Girafarig. With Murkrow at night, this route is now very Johto-y.
- Route 43 also has Gold's Flaaffy and Girafarig, but keeps the presence of Furret from Crystal.
- Viridian Forest now has wild data built from Ilex Forest.

Markers for unimplemented Pokemon to be used have also been added. Buu as a nighttime Jynx replacement, etc.
2023-10-27 10:10:54 +01:00
Zeta_Null a8a942cefb Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2023-10-26 15:26:09 -04:00
Zeta_Null 7f7ff6dc0b Nihon Music Attempt 2023-10-26 15:26:03 -04:00
Martha Schilling d4170f5fa8 Walking Wake and the Guardian Beast!
- Added preliminary data for Walking Wake and the new Legendary Pokemon Shi-Shi.
- Changed Bellignan's dex entry to reference how Sprout Tower was constructed.
- Changed some dialogue in Sprout Tower to reflect this.

Wake sprite by EyeDonutz
Shi-Shi sprite by me, but still unfinished. Will definitely rework sometime.
2023-10-26 16:16:00 +01:00
Llinos Evans a4854f63ba Trader NPC & Lake of Rage "Town"
This adds the Trader NPC to the Lake of Rage and restores its "town" environment.

The town is themed around evolution. The mart sells all the "normal" evolution stones, aiming to solve Johto's "stone problem" for Pokemon like Vulpix and Bellsprout. The Trader NPC actualises this, being at a point where most Pokemon are around Level 35-40, as is how we balanced it on Cinnabar Island in KEP.

The text is mostly revolved around the Gyarados, but this could shift.

The Gym isn't done - I don't have time to sort it at the moment - but I am thinking of making it a Pre-Gym. This doesn't make a lot of sense though, so maybe it should be changed to be the tower seen in an earlier build.
2023-10-26 13:51:05 +01:00
Llinos Evans b582a0e7aa Add Bellignan, fix evo stones
My first foray into adding Pokemon, here's Bellignan! Imported the sprite animation from Pokemon October. Works like a charm!

I also fixed the new evo stones, which didn't have their effects assigned yet.
2023-10-26 11:49:59 +01:00
Llinos Evans 8669e4f980
Merge pull request #8 from MementoMartha/master
Fixing Blastyke's and Totartle's palette issues
2023-10-26 09:54:08 +01:00
Martha Schilling 7370a7f519 fixing Blastyke's and Totartle's palette issues 2023-10-26 09:44:05 +01:00
Zeta_Null 05e2cdc3d2 Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2023-10-26 00:28:44 -04:00
ZetaNull 37302de1bf
Merge pull request #7 from LadyMisticus/master
TOTARTLE AND BLASTYKE!!! (+Viridian Forest & Debug Stuff)
2023-10-26 00:28:28 -04:00
Zeta_Null 852ad77cb1 Pewter Museum Bullshit 2023-10-26 00:28:11 -04:00
Misty Violet d1e9accd44 TOTARTLE AND BLASTYKEgit status! (+Viridian Forest & Debug Stuff) 2023-10-25 23:52:47 -04:00
Zeta_Null c6a4f3245b Oh fuck oops
TILESET ANIMATIONS. Should probably work fine once everything is finished but i'm not 100% sure on that so we need to be sure to check
2023-10-25 17:17:55 -04:00
Zeta_Null 120f8dd4d0 Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2023-10-25 17:06:21 -04:00
Zeta_Null 327490a1f5 Viridian Forest Tileset things 2023-10-25 17:06:06 -04:00
Llinos Evans 420031a601 Safari Zone wild data
forgot to submit OOPS
2023-10-25 20:14:28 +01:00
ZetaNull fbd030bc06
Merge pull request #6 from LadyMisticus/master
Base Stat Batch 5
2023-10-25 13:22:24 -04:00
Zeta_Null 8dd0d91710 Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2023-10-25 13:21:11 -04:00
Zeta_Null ebce2ce200 More Kanto Graphical changes + JP PC signs
All tree variants now included in kanto maps, with an overhauled blue tree as opposed to the original because holy SHIT

Also Buoy graphics instead of Bollards in the middle of the ocean lol
2023-10-25 13:20:48 -04:00
Misty e502ad25d0
Base Stat Batch 5
Finishing off the Kanto base stat ASMs! We're up to Melmetal now, on to Johto!
2023-10-25 01:25:57 -04:00
ZetaNull 8d70f9bef0
Merge pull request #5 from LadyMisticus/master
Base Stat Batch 4
2023-10-24 13:31:46 -04:00