Commit graph

71 commits

Author SHA1 Message Date
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
ZetaNull 37302de1bf
Merge pull request #7 from LadyMisticus/master
TOTARTLE AND BLASTYKE!!! (+Viridian Forest & Debug Stuff)
2023-10-26 00:28:28 -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
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
Misty 23fdbb8415
Base Stat Batch 4
A bunch of base stat ASMs, up to Disturban! Also includes Walking Wake!
2023-10-24 03:16:02 -04:00
Zeta_Null 1df5c043fc Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2023-10-23 14:27:15 -04:00
Zeta_Null aeaf084598 i didnt touch this but its screaming at me to commit this anyway??? 2023-10-23 14:27:10 -04:00
Zeta_Null 610a1f9c67 silent hills collision fix 2023-10-23 14:25:22 -04:00
Llinos Evans abc7ecab24
Merge pull request #4 from LadyMisticus/master
Fixing Map Sizes
2023-10-23 16:13:31 +01:00
Misty ee06fad63c
Merge branch 'ZetaNull:master' into master 2023-10-23 11:12:13 -04:00
Misty Violet a82fdf34dd Fixing Map Sizes 2023-10-23 11:11:18 -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
Llinos Evans 0d7a23c6ea
Merge pull request #3 from LadyMisticus/master
Bridge Code!
2023-10-23 11:32:21 +01:00
Misty Violet 079b231d7d forgot the bridge coordinates whoopsie 2023-10-23 03:52:45 -04:00
Misty Violet 1473612318 forgot the bridge coordinates whoopsie 2023-10-23 03:51:16 -04:00
Misty 6d771cded1
Merge branch 'ZetaNull:master' into master 2023-10-23 03:46:39 -04:00
Misty Violet d44cfa4365 Merge branch 'master' of https://github.com/LadyMisticus/jep-hack 2023-10-23 03:44:42 -04:00
Misty Violet 0b9a92c472 Bridge Code 2023-10-23 03:42:22 -04:00
ZetaNull 3976f9a734
Merge pull request #2 from LadyMisticus/master
Correcting my Mistakes + ASM Batch #3
2023-10-22 21:22:27 -04:00
Misty 1d1fdbe8db
ASM Batch #3
Up to Toedscreuel!
2023-10-22 18:23:30 -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 a6776e4051
ASM Batch #2 2023-10-20 16:29:29 -04:00
Misty 33bb62599e
Add files via upload 2023-10-20 16:28:18 -04:00
Misty bf2e690614
Update scripts.asm 2023-10-20 16:24:43 -04:00
Misty 196c9dc3c0
Update blocks.asm 2023-10-20 16:21:52 -04:00
Misty b0eec2d18d
Update attributes.asm 2023-10-20 16:13:13 -04:00
Misty 9002f31e55
Update landmarks.asm 2023-10-20 16:07:48 -04:00
Misty 472ca4351c
Merge branch 'ZetaNull:master' into master 2023-10-20 16:00:36 -04:00
Misty 33c594298d
Update maps.asm 2023-10-20 16:00:02 -04:00
Misty 3eccab1205
Update map_constants.asm 2023-10-20 15:30:56 -04:00
Misty b4d7aeeeca
Update landmark_constants.asm 2023-10-20 15:07:12 -04:00