Commit graph

122 commits

Author SHA1 Message Date
Zeta_Null 1a919e157a Partial pewter museum fix attempt (still broken. Can't tell why) 2023-10-30 12:04:41 -04: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
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
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
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
Zeta_Null 852ad77cb1 Pewter Museum Bullshit 2023-10-26 00:28:11 -04: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
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
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 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 33c594298d
Update maps.asm 2023-10-20 16:00:02 -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 2f8a41f833 First Commit
Upload literally everything from the pokecrystal16 expand-move-ID branch
2023-09-10 12:35:35 -04:00