Commit graph

30 commits

Author SHA1 Message Date
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
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
327490a1f5 Viridian Forest Tileset things 2023-10-25 17:06:06 -04:00
Misty Violet
a82fdf34dd Fixing Map Sizes 2023-10-23 11:11:18 -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
472ca4351c
Merge branch 'ZetaNull:master' into master 2023-10-20 16:00:36 -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
Misty
391de21083
Update landmark_constants.asm 2023-10-20 14:57:21 -04:00
Zeta_Null
efd3ce0f00 Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2023-10-20 14:33:46 -04:00
Zeta_Null
f7d3f9b08d Instant text speed + Roof colors
Added instant text speed and changed ruins of alph and silent hills's roof palettes
2023-10-20 14:33:35 -04:00
Llinos Evans
5c9b80e1a8 Add Fairy-type and Fairy Feather
This adds the Fairy type and the Fairy Feather. Neither are obtainable yet, but will be with time.
2023-10-20 19:02:50 +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
d419bf77d6 Bump max Object_Events up from 15 to 17
Breaks save compatibility with previous build. Oh well!
2023-10-18 20:41:41 -04:00
Zeta_Null
820c2257bc Tiles can have different attributes in different blocks 2023-09-13 12:44:30 -04:00
Zeta_Null
94d9c77070 Expand tilesets from 192 to 255 tiles 2023-09-12 13:59:09 -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
5a182b17f0 Replace unused pink palette with a purple one
What it says on the tin lol
2023-09-10 13:59:25 -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