diff --git a/data/tilesets/lushcave_attributes.bin b/data/tilesets/lushcave_attributes.bin index e38fe53..9365301 100644 Binary files a/data/tilesets/lushcave_attributes.bin and b/data/tilesets/lushcave_attributes.bin differ diff --git a/data/tilesets/lushcave_collision.asm b/data/tilesets/lushcave_collision.asm index b47fa90..5957d5f 100644 --- a/data/tilesets/lushcave_collision.asm +++ b/data/tilesets/lushcave_collision.asm @@ -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 diff --git a/data/tilesets/lushcave_metatiles.bin b/data/tilesets/lushcave_metatiles.bin index 29883bd..e0528f1 100644 Binary files a/data/tilesets/lushcave_metatiles.bin and b/data/tilesets/lushcave_metatiles.bin differ diff --git a/data/tilesets/park_attributes.bin b/data/tilesets/park_attributes.bin index 1c2b316..2f6d356 100644 Binary files a/data/tilesets/park_attributes.bin and b/data/tilesets/park_attributes.bin differ diff --git a/data/tilesets/park_collision.asm b/data/tilesets/park_collision.asm index 7a223a7..a6b0a83 100644 --- a/data/tilesets/park_collision.asm +++ b/data/tilesets/park_collision.asm @@ -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 diff --git a/data/tilesets/park_metatiles.bin b/data/tilesets/park_metatiles.bin index 853b8bb..916a88b 100644 Binary files a/data/tilesets/park_metatiles.bin and b/data/tilesets/park_metatiles.bin differ diff --git a/gfx/tilesets/park.png b/gfx/tilesets/park.png index 4fd5378..cc1f3e2 100644 Binary files a/gfx/tilesets/park.png and b/gfx/tilesets/park.png differ diff --git a/layout.link b/layout.link index 42edf16..7c2ee5b 100644 --- a/layout.link +++ b/layout.link @@ -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 diff --git a/ram/wram.asm b/ram/wram.asm index 38a536b..5d4b7a0 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -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