thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-09-16 18:20:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

ITEMFIX: I hate working with WRAM

Browse source 
CHANGES ARE COMMENTED IN WRAM.ASM, IF ANYTHING BREAKS, CHECK THERE.

Not thoroughly tested but I've yeeted some unused shit in WRAM to be able to fit Misc WRAM 1 back in the right bank.
Side note but according to pret if a ds has a blank space above and below it then it should be unused? May be wise to double check this
This commit is contained in:
Zeta_Null 2024-12-13 01:00:32 -05:00
parent 5e04430263
commit 2e053211ec
9 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/tilesets/lushcave_attributes.bin
View file

Binary file not shown.

4
data/tilesets/lushcave_collision.asm
View file

@ -82,3 +82,7 @@
tilecoll WATER, WATER, WATER, WATER ; 51
tilecoll WATER, WATER, WATER, WATER ; 52
tilecoll WATER, WATER, WATER, WATER ; 53
tilecoll WALL, WALL, WALL, WALL ; 54
tilecoll FLOOR, WALL, WALL, WALL ; 55
tilecoll WALL, FLOOR, WALL, WALL ; 56
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 57

BIN
data/tilesets/lushcave_metatiles.bin
View file

Binary file not shown.

BIN
data/tilesets/park_attributes.bin
View file

Binary file not shown.

14
data/tilesets/park_collision.asm
View file

@ -64,3 +64,17 @@
tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 3f
tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 40
tilecoll FLOOR, WALL, WARP_CARPET_DOWN, WALL ; 41
tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 42
tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 43
tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 44
tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 45
tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 46
tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 47
tilecoll WALL, WALL, WALL, WALL ; 48
tilecoll WALL, WALL, WALL, WALL ; 49
tilecoll WALL, WALL, WALL, WALL ; 4a
tilecoll WALL, WALL, WALL, WALL ; 4b
tilecoll WALL, WALL, WALL, WALL ; 4c
tilecoll WALL, WALL, WALL, WALL ; 4d
tilecoll WALL, WALL, WALL, WALL ; 4e
tilecoll WALL, WALL, DOOR, WALL ; 4f

BIN
data/tilesets/park_metatiles.bin
View file

Binary file not shown.

BIN
gfx/tilesets/park.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

2
layout.link
View file

@ -337,11 +337,11 @@ WRAM0
"16-bit WRAM home data"
WRAMX 1
"WRAM 1"
"Miscellaneous WRAM 1" ; had to move it here to get it to build, making a note in case this breaks something
"More WRAM 1"
"Enemy Party"
"Party"
WRAMX 2
"Miscellaneous WRAM 1" ; had to move it here to get it to build, making a note in case this breaks something
"Pic Animations"
"Surrounding Data"
align 8

11
ram/wram.asm
View file

@ -3146,7 +3146,9 @@ wWiltonFightCount:: db
wParryFightCount:: db
wErinFightCount:: db
ds 100
; ds 100
; ITEMFIX: Needed to free up a few bytes, and for each new pokemon this would need to be done again in theory. I've halfed this because it seems to be unused? Which should buy some time.
ds 50
wEventFlags:: flag_array NUM_EVENTS
@ -3331,12 +3333,13 @@ wPartyMon{d:n}Nickname:: ds MON_NAME_LENGTH
endr
wPartyMonNicknamesEnd::
ds 20 ; modified to fit the new unown
; ds 20 ; modified to fit the new unown
; ITEMFIX: According to the unown form tutorial this is entirely unused? Commented out to make space for increasingly large num_pokemon.
wPokedexCaught:: flag_array NUM_POKEMON
wPokedexCaught:: flag_array NUM_POKEMON ; ITEMFIX: I've not changed this but FUCK YOU FOR MAKING THINGS HARD FOR NO REASON
wEndPokedexCaught::
wPokedexSeen:: flag_array NUM_POKEMON
wPokedexSeen:: flag_array NUM_POKEMON ; ITEMFIX: Same as above, no actual change, just a FUCK YOU to num_pokemon lmao
wEndPokedexSeen::
wUnownDex:: ds NUM_UNOWN