diff --git a/constants/map_constants.asm b/constants/map_constants.asm index d9b5a1e..ed28e90 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -568,7 +568,7 @@ ENDM endgroup newgroup TWO_ISLAND ; 29 - map_const TWO_ISLAND, 10, 10 ; 1 + map_const TWO_ISLAND, 20, 9 ; 1 map_const CAPE_BRINK, 10, 10 ; 2 endgroup diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 5163eea..3945426 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -746,12 +746,6 @@ MtEmberSummit_Blocks: MtEmberHiddenPath_Blocks: INCBIN "maps/MtEmberHiddenPath.ablk" -TwoIsland_Blocks: - INCBIN "maps/TwoIsland.ablk" - -CapeBrink_Blocks: - INCBIN "maps/CapeBrink.ablk" - SECTION "Map Blocks 3", ROMX SlowpokeWellB1F_Blocks: @@ -1279,3 +1273,10 @@ Route50_Blocks: JackysHouse_Blocks: INCBIN "maps/JackysHouse.ablk" + +TwoIsland_Blocks: + INCBIN "maps/TwoIsland.ablk" + +CapeBrink_Blocks: + INCBIN "maps/CapeBrink.ablk" + diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 304228c..7c2333e 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -621,8 +621,8 @@ MapGroup_OneIsland: ; 28 MapGroup_TwoIsland: ; 29 table_width MAP_LENGTH, MapGroup_TwoIsland - map TwoIsland, TILESET_CAVE, TOWN, LANDMARK_TWO_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map CapeBrink, TILESET_CAVE, ROUTE, LANDMARK_TWO_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map TwoIsland, TILESET_SEVII, TOWN, LANDMARK_TWO_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map CapeBrink, TILESET_SEVII, ROUTE, LANDMARK_TWO_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE assert_table_length NUM_TWO_ISLAND_MAPS MapGroup_ThreeIsland: ; 30 diff --git a/data/maps/roofs.asm b/data/maps/roofs.asm index f3850db..7048610 100644 --- a/data/maps/roofs.asm +++ b/data/maps/roofs.asm @@ -39,13 +39,13 @@ MapGroupRoofs: db -1 ; 25 db ROOF_NEW_BARK ; 26 (Cherrygrove) db ROOF_GOLDENROD ; 27 (Citrine) - db ROOF_NEW_BARK ; 28 (One Island) - db ROOF_VIOLET ; 29 (Two Island) - db ROOF_VIOLET ; 30 (Three Island) - db ROOF_VIOLET ; 31 (Four Island) - db ROOF_VIOLET ; 32 (Five Island) - db ROOF_VIOLET ; 33 (Six Island) - db ROOF_VIOLET ; 34 (Seven Island) + db ROOF_AZALEA ; 28 (One Island) + db ROOF_AZALEA ; 29 (Two Island) + db ROOF_AZALEA ; 30 (Three Island) + db ROOF_AZALEA ; 31 (Four Island) + db ROOF_AZALEA ; 32 (Five Island) + db ROOF_AZALEA ; 33 (Six Island) + db ROOF_AZALEA ; 34 (Seven Island) db ROOF_NEW_BARK ; 35 (Silent Hills) db ROOF_VIOLET ; 36 (Old City) db ROOF_NEW_BARK ; 37 (Blue Forest) diff --git a/data/tilesets/sevii_attributes.bin b/data/tilesets/sevii_attributes.bin index 6acebf3..5026e33 100644 Binary files a/data/tilesets/sevii_attributes.bin and b/data/tilesets/sevii_attributes.bin differ diff --git a/data/tilesets/sevii_collision.asm b/data/tilesets/sevii_collision.asm index ea023f5..3e5f85f 100644 --- a/data/tilesets/sevii_collision.asm +++ b/data/tilesets/sevii_collision.asm @@ -39,7 +39,7 @@ tilecoll FLOOR, WALL, WALL, WALL ; 26 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 - tilecoll WATER, WALL, WATER, FLOOR ; 29 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 29 tilecoll WALL, WALL, FLOOR, FLOOR ; 2a tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2b tilecoll WATER, WATER, WATER, WATER ; 2c @@ -113,5 +113,8 @@ tilecoll WALL, WALL, WALL, DOOR ; 70 tilecoll WALL, WALL, WALL, WALL ; 71 tilecoll WALL, WALL, WALL, WALL ; 72 - tilecoll WALL, DOOR, FLOOR, FLOOR ; 73 - tilecoll WALL, WALL, FLOOR, FLOOR ; 74 + tilecoll WALL, WALL, WALL, DOOR ; 73 + tilecoll WALL, WALL, WALL, WALL ; 74 + tilecoll WATER, WALL, WALL, WALL ; 75 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 76 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 77 diff --git a/data/tilesets/sevii_metatiles.bin b/data/tilesets/sevii_metatiles.bin index 0fd499a..55b5d13 100644 Binary files a/data/tilesets/sevii_metatiles.bin and b/data/tilesets/sevii_metatiles.bin differ diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index f3b732a..228ed1a 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -90,4 +90,4 @@ RGB 31,31,31, 31,31,31, 25,30,00, 25,30,00 ; PREDEFPAL_GAMEFREAK_LOGO_OB RGB 00,00,00, 08,11,11, 21,21,21, 31,31,31 ; PREDEFPAL_GAMEFREAK_LOGO_BG RGB 31,31,31, 23,21,16, 15,20,20, 00,00,00 ; PREDEFPAL_ROUTES_NIHON - RGB 31,31,31, 18,18,18, 15,20,20, 00,00,00 ; PREDEFPAL_GATES_NIHON + RGB 31,31,31, 18,18,18, 15,20,20, 00,00,00 ; PREDEFPAL_GATES_NIHON diff --git a/gfx/tilesets/sevii.png b/gfx/tilesets/sevii.png index a7e920f..e6cc1b4 100644 Binary files a/gfx/tilesets/sevii.png and b/gfx/tilesets/sevii.png differ diff --git a/home/map.asm b/home/map.asm index 5488ca3..c8eba13 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1377,6 +1377,8 @@ LoadTilesetGFX:: jr z, .load_roof cp TILESET_BATTLE_TOWER_OUTSIDE jr z, .load_roof + cp TILESET_SEVII + jr z, .load_roof jr .skip_roof .load_roof diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index 5f7989e..27c24a7 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -402,7 +402,7 @@ DebugRoom_MapEvents: warp_event 35, 17, OLD_CITY, 1 ; east warp warp_event 5, 35, LAVENDER_TOWN, 1 ; southwest warp warp_event 19, 34, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; southern warp - warp_event 33, 33, ONE_ISLAND, 1 ; southeast warp + warp_event 33, 33, TWO_ISLAND, 1 ; southeast warp warp_event 5, 3, AZALEA_TOWN, 1 warp_event 34, 11, WINNERS_PATH, 3 diff --git a/maps/KindleRoad.ablk b/maps/KindleRoad.ablk index d341c33..725be3a 100644 --- a/maps/KindleRoad.ablk +++ b/maps/KindleRoad.ablk @@ -38,5 +38,5 @@ K66DE8 66JFE8 - 67GDE8 7(HI80(((L"M(83M!(8978!(89V8#(B#3M#! #3@!)*+.=!-,,/,, \ No newline at end of file +7 1&(((L4"0>"M #30@!)*+.9=!,,,/,,3 \ No newline at end of file diff --git a/maps/TwoIsland.ablk b/maps/TwoIsland.ablk index eeb5760..8cab729 100644 Binary files a/maps/TwoIsland.ablk and b/maps/TwoIsland.ablk differ diff --git a/maps/TwoIsland.asm b/maps/TwoIsland.asm index b6e202c..f48dc38 100644 --- a/maps/TwoIsland.asm +++ b/maps/TwoIsland.asm @@ -9,6 +9,8 @@ TwoIsland_MapEvents: db 0, 0 ; filler def_warp_events + warp_event 8, 7, DEBUG_ROOM, 1 + warp_event 9, 7, DEBUG_ROOM, 1 def_coord_events diff --git a/seviimap1.tilemap b/seviimap1.tilemap new file mode 100644 index 0000000..5bd37cd Binary files /dev/null and b/seviimap1.tilemap differ diff --git a/seviimap2.tilemap b/seviimap2.tilemap new file mode 100644 index 0000000..40aa8cf Binary files /dev/null and b/seviimap2.tilemap differ