Commit graph

155 commits

Author SHA1 Message Date
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
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
Misty 2fad1a5e34
Merge branch 'ZetaNull:master' into master 2023-10-20 14:19:41 -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
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
Llinos Evans 55f4427fc1 This shit needs debug NOW
This makes the ROM build with the Debug Room available. It requires a save file to be available to you.

I also removed the stupid jutsu button combo required to access it while selecting.
2023-10-20 17:29:25 +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
Misty 7fd13172e0
Merge pull request #2 from ZetaNull/master
Simplify clock reset procedures
2023-10-19 23:31:56 -04:00
Llinos Evans 26bb9fbc7b Simplify clock reset procedures
Taken from this tutorial. Makes it like GS, but down Down + B instead of Down + B + Select.

Used this tutorial: https://github.com/pret/pokecrystal/wiki/simplify-the-clock-reset-procedure
2023-10-20 04:26:05 +01:00
Misty 4a6783f17b
Merge pull request #1 from ZetaNull/master
Bump max Object_Events up from 15 to 17
2023-10-19 02:00:16 -04: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
Misty d784138e7e
Proof of Concept 2023-10-14 14:13:22 -04:00
Misty 274661debd
Proof Of Concept 2023-10-14 14:04:14 -04:00
Zeta_Null 820c2257bc Tiles can have different attributes in different blocks 2023-09-13 12:44:30 -04:00