Commit graph

41 commits

Author SHA1 Message Date
Llinos Evans 038970363f Kurt instamakes balls now 2023-11-01 20:31:28 +00: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
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 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
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
Martha Schilling 37fbf884f3
Merge branch 'ZetaNull:master' into master 2023-10-27 17:09:09 +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
Zeta_Null 05e2cdc3d2 Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2023-10-26 00:28:44 -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 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
Zeta_Null 59bdc864cd Kanto tileset and block upgrades
- Bollards from Yellow
- Roof tiles from Yellow and Blue
- Trees and Signs from Green, Blue, and Yellow
- Improved roof shading
- Japanese PC Pokecenter Icon in Kanto tileset
- Oaks RBY lab design
- Some small amount of usage of new sign tiles in some Kanto maps
- Pewter City Museum roof finally doesn't have a crack in it
- also a fix for some messed up collision in silent hills lol
2023-10-24 13:30:31 -04:00
Llinos Evans f983bc8f16 Prototype Safari Zone map
No scripts or Safari Game yet, but this removes the details of the Safari Zone's closure and adds the map back in. Fixed the entry zone and stuff while I was at it.

Fully functional.
2023-10-23 16:01:55 +01:00
Llinos Evans d4437ee259 minor tweaks
viridian forest and pewter museum crash on entry, cerulean cave needs the map dimensions fixed
2023-10-23 15:36:14 +01:00
Llinos Evans b42a806842 Pewter Museum & Viridian Forest warps
Required a little tinkering because I'm vain and wanted the door to be accurate. Please understand.

When doing Viridian Forest I had a bit of a moment and kept trying to use the entirely wrong building when it was staring me in the face. I am sorry.

I'm getting an 8-bit error on Mewtwo's object code in Cerulean Cave B1F. Misty may need to check this, I'm just getting these locations put in the overworld.
2023-10-23 14:47:32 +01:00
Llinos Evans e484b49503 Restore warps to Cerulean Cave
This adds the warp to Cerulean Cave into Cerulean City, including the small walk to Route 4. I've moved the Berserk Gene to be underneath where Mewtwo stands, since its location is no longer necessary.
2023-10-23 14:01:48 +01:00
Misty Violet 1473612318 forgot the bridge coordinates whoopsie 2023-10-23 03:51:16 -04:00
Misty Violet 0b9a92c472 Bridge Code 2023-10-23 03:42:22 -04:00
Misty Violet d0d6bbb8cf Fixing My Errors + More 2023-10-22 18:15:19 -04:00
Llinos Evans fa5f2111f9 these keep coming up 2023-10-20 22:40:33 +01:00
ZetaNull db9bde9c89
Merge pull request #1 from LadyMisticus/master
Maps & ASM Batches 1+2!
2023-10-20 17:00:42 -04:00
Zeta_Null cf907d225f Nihon Tileset
Added Nihon01 tileset
2023-10-20 16:57:41 -04:00
Misty 33bb62599e
Add files via upload 2023-10-20 16:28:18 -04:00
Llinos Evans 82e264f425 Nihon Map fixes
This fixes the Town Map for Nihon. Fly map and other bits and pieces may still require some tinkering. Needs further testing.
2023-10-20 18:30:54 +01:00
Zeta_Null 5e9e9b4b65 Fixed Typos and added unused SGB Colors for later use 2023-10-20 02:08:39 -04:00
Llinos Evans a8546f60c9 Nihon + Silent Hills Groundwork
Currently doesn't build due to a weird error

```
rgbasm -hL -Q8 -P includes.asm -Weverything -Wnumeric-string=2 -Wtruncation=1  -o data/maps/map_data.o data/maps/map_data.asm
error: data/maps/map_data.asm(3) -> data/maps/maps.asm(544) -> macros/asserts.as
m::assert_table_length(14):
    Expected constant expression: 'NUM_SILENT_HILLS_MAP' is not constant at asse
mbly time
error: data/maps/map_data.asm(3) -> data/maps/maps.asm(544) -> macros/asserts.as
m::assert_table_length(16):
    Assertion failed: MapGroup_SilentHills: expected 0 entries, each 9 bytes
error: Assembly aborted (2 errors)!
make: *** [Makefile:119: data/maps/map_data.o] Error 1
```
2023-10-20 06:23:47 +01:00
Zeta_Null 820c2257bc Tiles can have different attributes in different blocks 2023-09-13 12:44:30 -04:00
Zeta_Null b3a3e27906 Initial giant enby Commit
- Changed name lists
- Made Overworld pink palette into purple palette
- Changed gender selection options
- Added Topaz's graphics (Enby Trainer)
- Changed more or less every gender check in the game to account for enby option
- Changed out Morty's palette on  the trainer card to a more purple one to facilitate Topaz's graphics

KNOWN ISSUES / THINGS TO CHANGE
- Topaz's sprite does not currently render correctly on town map (check if this is a map issue or if it occasionally will pop up elsewhere as well)
- Bag Palette is still green like the tutorial made it. Might change it to yellow or something later on.
2023-09-11 11:26:46 -04:00
Zeta_Null 2f8a41f833 First Commit
Upload literally everything from the pokecrystal16 expand-move-ID branch
2023-09-10 12:35:35 -04:00