From fc56ea0fda873f77a4e869e3b69c0a600455e520 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Tue, 15 Oct 2024 21:26:07 -0400 Subject: [PATCH] Basic four island stuff. Get to unused routes later --- constants/map_constants.asm | 2 +- data/maps/attributes.asm | 2 +- data/maps/maps.asm | 2 +- data/tilesets/sevii_attributes.bin | Bin 2192 -> 2192 bytes data/tilesets/sevii_collision.asm | 2 +- data/tilesets/sevii_metatiles.bin | Bin 2192 -> 2192 bytes gfx/pokegear/sevii1.bin | Bin 361 -> 361 bytes maps/DebugRoom.asm | 2 +- maps/FourIsland.ablk | Bin 100 -> 500 bytes maps/FourIsland.asm | 3 ++- 10 files changed, 7 insertions(+), 6 deletions(-) diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 3fda452..3657797 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -584,7 +584,7 @@ ENDM endgroup newgroup FOUR_ISLAND ; 31 - map_const FOUR_ISLAND, 10, 10 ; 1 + map_const FOUR_ISLAND, 25, 20 ; 1 map_const ICEFALL_CAVE_ENTRANCE, 10, 10 ; 2 map_const ICEFALL_CAVE_1F, 10, 10 ; 3 map_const ICEFALL_CAVE_B1F, 10, 10 ; 4 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 26cd21e..24dc17b 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -782,7 +782,7 @@ ENDM connection east, ThreeIsland, THREE_ISLAND, 3 map_attributes BerryForest, BERRY_FOREST, $05, 0 ; Bank 3 - map_attributes FourIsland, FOUR_ISLAND, $00, 0 ; Bank 3 + map_attributes FourIsland, FOUR_ISLAND, $02, 0 ; Bank 3 map_attributes IcefallCaveEntrance, ICEFALL_CAVE_ENTRANCE, $00, 0 ; Bank 3 map_attributes IcefallCave1F, ICEFALL_CAVE_1F, $00, 0 ; Bank 3 map_attributes IcefallCaveB1F, ICEFALL_CAVE_B1F, $00, 0 ; Bank 3 diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 8171bec..b0a0309 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -639,7 +639,7 @@ MapGroup_ThreeIsland: ; 30 MapGroup_FourIsland: ; 31 table_width MAP_LENGTH, MapGroup_FourIsland - map FourIsland, TILESET_CAVE, TOWN, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map FourIsland, TILESET_SEVII, TOWN, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map IcefallCaveEntrance, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE map IcefallCave1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE map IcefallCaveB1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE diff --git a/data/tilesets/sevii_attributes.bin b/data/tilesets/sevii_attributes.bin index 015b188feb5fef45240bf3d879f0aebdba246fe1..30aca7e43bc1a5570aa5c25017d553061fd25b24 100644 GIT binary patch delta 15 WcmbOrI6-hj0LNqvMuW)(i~;~A)dWib delta 72 ScmbOrI6-hj0EYtyg#ZBXbOeh4 diff --git a/data/tilesets/sevii_collision.asm b/data/tilesets/sevii_collision.asm index b771858..0930d65 100644 --- a/data/tilesets/sevii_collision.asm +++ b/data/tilesets/sevii_collision.asm @@ -134,4 +134,4 @@ tilecoll WALL, WALL, WALL, WALL ; 85 tilecoll WALL, WALL, WALL, WALL ; 86 tilecoll WALL, WALL, WALL, WALL ; 87 - tilecoll WALL, WALL, WALL, WALL ; 88 + tilecoll FLOOR, FLOOR, WALL, WALL ; 88 diff --git a/data/tilesets/sevii_metatiles.bin b/data/tilesets/sevii_metatiles.bin index 9392f03f36ff83f50556dbb0d437eb41e6528080..19f79739c31edf10d0fd4dfd46c3ff426d9d83cc 100644 GIT binary patch delta 72 zcmbOrI6-hj0EdHvgQJ0i0}#Q1l9Gdinwo0Qt6>5X|^k9}P^8y~HPq69urZBYg!I;#ZYbzNu2a7CpxQfZq z4fPYTB2^?3@k%qHpM-<88Cr2x0q*SXX+_keZ-Ym4FWl3!bJQnlz|l5B>|OR)h*CS- OVk;TQAdo!ifBFNA12t~| literal 100 LcmZQzpgjNp0Av6G diff --git a/maps/FourIsland.asm b/maps/FourIsland.asm index 051181a..3c06e84 100644 --- a/maps/FourIsland.asm +++ b/maps/FourIsland.asm @@ -14,7 +14,8 @@ FourIsland_MapEvents: db 0, 0 ; filler def_warp_events - + warp_event 12, 29, DEBUG_ROOM, 1 + warp_event 13, 29, DEBUG_ROOM, 1 def_coord_events def_bg_events