diff --git a/constants/map_constants.asm b/constants/map_constants.asm index a44a4b4..0647566 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -558,7 +558,7 @@ ENDM newgroup ONE_ISLAND ; 28 map_const FARAWAY_ISLAND_OUTSIDE, 10, 10 ; 1 map_const FARAWAY_ISLAND_INSIDE, 10, 10 ; 2 - map_const ONE_ISLAND, 10, 10 ; 3 + map_const ONE_ISLAND, 12, 12 ; 3 map_const TREASURE_BEACH, 10, 10 ; 4 map_const KINDLE_ROAD, 10, 10 ; 5 map_const MT_EMBER_EXTERIOR, 10, 10 ; 6 diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index 2e28f97..af23d86 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -51,6 +51,7 @@ const TILESET_NIHON_GATE ; 31 const TILESET_NIHON_MART ; 32 const TILESET_NIHON_WHITECITY ; 33 + const TILESET_SEVII ; 34 DEF NUM_TILESETS EQU const_value - 1 ; wTileset struct size diff --git a/data/maps/maps.asm b/data/maps/maps.asm index f9fa42b..b7368ba 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -608,11 +608,11 @@ MapGroup_Citrine: ; 27 MapGroup_OneIsland: ; 28 table_width MAP_LENGTH, MapGroup_OneIsland - map FarawayIslandOutside, TILESET_CAVE, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map FarawayIslandOutside, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map FarawayIslandInside, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_AUTO, FISHGROUP_SHORE - map OneIsland, TILESET_CAVE, TOWN, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map TreasureBeach, TILESET_CAVE, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map KindleRoad, TILESET_CAVE, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map OneIsland, TILESET_SEVII, TOWN, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map TreasureBeach, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map KindleRoad, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map MtEmberExterior, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_AUTO, FISHGROUP_SHORE map MtEmberInterior, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE map MtEmberSummit, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_AUTO, FISHGROUP_SHORE diff --git a/data/tilesets.asm b/data/tilesets.asm index 7da8f48..5ac4b37 100644 --- a/data/tilesets.asm +++ b/data/tilesets.asm @@ -63,4 +63,5 @@ Tilesets:: tileset TilesetNihonGate tileset TilesetNihonMart tileset TilesetNihonWhiteCity + tileset TilesetSevii assert_table_length NUM_TILESETS + 1 diff --git a/data/tilesets/sevii_attributes.bin b/data/tilesets/sevii_attributes.bin new file mode 100644 index 0000000..6b90c7e Binary files /dev/null and b/data/tilesets/sevii_attributes.bin differ diff --git a/data/tilesets/sevii_collision.asm b/data/tilesets/sevii_collision.asm new file mode 100644 index 0000000..0163516 --- /dev/null +++ b/data/tilesets/sevii_collision.asm @@ -0,0 +1,56 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll WATER, WATER, WATER, WATER ; 02 + tilecoll WALL, WALL, WALL, WALL ; 03 + tilecoll WATER, WATER, WATER, WATER ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll WALL, WALL, WALL, WALL ; 07 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, WALL, WALL ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0b + tilecoll WATER, WALL, WATER, WALL ; 0c + tilecoll WALL, WALL, WALL, WALL ; 0d + tilecoll WALL, WATER, WALL, WATER ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll WALL, WALL, WALL, DOOR ; 10 + tilecoll WALL, WALL, WALL, WALL ; 11 + tilecoll FLOOR, FLOOR, WALL, WALL ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 + tilecoll WALL, WALL, WALL, WALL ; 14 + tilecoll WALL, FLOOR, WALL, FLOOR ; 15 + tilecoll FLOOR, WALL, FLOOR, WALL ; 16 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 19 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1a + tilecoll FLOOR, FLOOR, WALL, WALL ; 1b + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1c + tilecoll WALL, DOOR, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, FLOOR, FLOOR ; 1e + tilecoll WALL, WALL, WALL, WALL ; 1f + tilecoll FLOOR, WALL, FLOOR, WALL ; 20 + tilecoll WALL, WATER, WALL, WALL ; 21 + tilecoll WALL, WATER, WALL, WATER ; 22 + tilecoll WATER, WALL, WALL, WALL ; 23 + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 24 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 25 + 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 WALL, WALL, FLOOR, FLOOR ; 2a + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2b + tilecoll WATER, WATER, WATER, WATER ; 2c + tilecoll WATER, WATER, WATER, WATER ; 2d + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll WATER, WATER, WATER, WATER ; 30 + tilecoll FLOOR, FLOOR, WALL, WALL ; 31 + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 32 + tilecoll WATER, WATER, WATER, WATER ; 33 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 34 + tilecoll WALL, WALL, WALL, WALL ; 35 + tilecoll WALL, WALL, WALL, WALL ; 36 + tilecoll WALL, WALL, WALL, WALL ; 37 diff --git a/data/tilesets/sevii_metatiles.bin b/data/tilesets/sevii_metatiles.bin new file mode 100644 index 0000000..dde2371 Binary files /dev/null and b/data/tilesets/sevii_metatiles.bin differ diff --git a/engine/tilesets/tileset_anims.asm b/engine/tilesets/tileset_anims.asm index 91be320..7776c14 100644 --- a/engine/tilesets/tileset_anims.asm +++ b/engine/tilesets/tileset_anims.asm @@ -244,6 +244,7 @@ TilesetNihonOldAnim: TilesetNihonSouthAnim: TilesetNihonWestAnim: TilesetNihonWhiteCityAnim: +TilesetSeviiAnim: dw vTiles2 tile $14, AnimateWaterTile dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index 921cdc0..f3b732a 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -24,13 +24,13 @@ RGB 31,31,31, 26,26,26, 15,20,31, 00,00,00 ; PREDEFPAL_SILVER_CAVE RGB 31,31,31, 21,14,09, 15,20,20, 00,00,00 ; PREDEFPAL_DUNGEONS RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_CITRINE (temp) - RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_ONE_ISLAND (temp) - RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_TWO_ISLAND (temp) - RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_THREE_ISLAND (temp) - RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_FOUR_ISLAND (temp) - RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_FIVE_ISLAND (temp) - RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_SIX_ISLAND (temp) - RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_SEVEN_ISLAND (temp) + RGB 31,31,31, 30,20,21, 15,20,31, 00,00,00 ; PREDEFPAL_ONE_ISLAND + RGB 31,31,31, 30,23,17, 15,20,31, 00,00,00 ; PREDEFPAL_TWO_ISLAND + RGB 31,31,31, 29,28,15, 15,20,31, 00,00,00 ; PREDEFPAL_THREE_ISLAND + RGB 31,31,31, 18,31,16, 15,20,31, 00,00,00 ; PREDEFPAL_FOUR_ISLAND + RGB 31,31,31, 17,29,31, 15,20,31, 00,00,00 ; PREDEFPAL_FIVE_ISLAND + RGB 31,31,31, 24,23,31, 15,20,31, 00,00,00 ; PREDEFPAL_SIX_ISLAND + RGB 31,31,31, 29,21,31, 15,20,31, 00,00,00 ; PREDEFPAL_SEVEN_ISLAND RGB 31,31,31, 12,28,22, 15,20,20, 00,00,00 ; PREDEFPAL_SILENT_HILLS RGB 31,31,31, 21,14,09, 15,20,20, 00,00,00 ; PREDEFPAL_OLD_CITY (31,31,31, 25,20,16, 15,20,31, 00,00,00 for Final-style colors) RGB 31,31,31, 18,14,31, 15,20,20, 00,00,00 ; PREDEFPAL_BLUE_FOREST (31,31,31, 22,19,31, 15,20,31, 00,00,00 for Final-style colors) diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index a31ab87..712685f 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -639,3 +639,15 @@ INCLUDE "data/tilesets/tower_collision.asm" TilesetTowerAttr:: INCBIN "data/tilesets/tower_attributes.bin" + +TilesetSeviiGFX:: +INCBIN "gfx/tilesets/sevii.2bpp.lz" + +TilesetSeviiMeta:: +INCBIN "data/tilesets/sevii_metatiles.bin" + +TilesetSeviiColl:: +INCLUDE "data/tilesets/sevii_collision.asm" + +TilesetSeviiAttr:: +INCBIN "data/tilesets/sevii_attributes.bin" diff --git a/gfx/tilesets/roofs.pal b/gfx/tilesets/roofs.pal index 497843a..fad2361 100644 --- a/gfx/tilesets/roofs.pal +++ b/gfx/tilesets/roofs.pal @@ -110,26 +110,26 @@ RGB 31,31,31, 29,26,18 RGB 15,20,31, 00,00,00 ; PREDEFPAL_CITRINE (temp) - RGB 31,31,31, 29,26,18 - RGB 15,20,31, 00,00,00 ; PREDEFPAL_ONE_ISLAND (temp) + RGB 28,04,09, 19,00,08 + RGB 19,02,12, 10,01,09 ; PREDEFPAL_ONE_ISLAND - RGB 31,31,31, 29,26,18 - RGB 15,20,31, 00,00,00 ; PREDEFPAL_TWO_ISLAND (temp) + RGB 31,18,00, 27,08,00 + RGB 19,11,07, 16,05,03 ; PREDEFPAL_TWO_ISLAND - RGB 31,31,31, 29,26,18 - RGB 15,20,31, 00,00,00 ; PREDEFPAL_THREE_ISLAND (temp) + RGB 31,27,00, 28,18,00 + RGB 16,13,06, 12,08,05 ; PREDEFPAL_THREE_ISLAND - RGB 31,31,31, 29,26,18 - RGB 15,20,31, 00,00,00 ; PREDEFPAL_FOUR_ISLAND (temp) + RGB 00,31,12, 00,18,13 + RGB 01,15,12, 02,10,11 ; PREDEFPAL_FOUR_ISLAND - RGB 31,31,31, 29,26,18 - RGB 15,20,31, 00,00,00 ; PREDEFPAL_FIVE_ISLAND (temp) + RGB 00,23,31, 00,07,25 + RGB 01,13,25, 00,04,21 ; PREDEFPAL_FIVE_ISLAND - RGB 31,31,31, 29,26,18 - RGB 15,20,31, 00,00,00 ; PREDEFPAL_SIX_ISLAND (temp) + RGB 16,08,31, 12,01,21 + RGB 11,02,27, 03,04,20 ; PREDEFPAL_SIX_ISLAND - RGB 31,31,31, 29,26,18 - RGB 15,20,31, 00,00,00 ; PREDEFPAL_SEVEN_ISLAND (temp) + RGB 26,08,31, 16,01,22 + RGB 17,02,23, 08,02,20 ; PREDEFPAL_SEVEN_ISLAND ; group 27 (Silent Hills) RGB 09,31,23, 10,22,22 ; morn/day diff --git a/gfx/tilesets/sevii.png b/gfx/tilesets/sevii.png new file mode 100644 index 0000000..a7e920f Binary files /dev/null and b/gfx/tilesets/sevii.png differ diff --git a/maps/DebugRoom.ablk b/maps/DebugRoom.ablk index 92733ea..43bd890 100644 --- a/maps/DebugRoom.ablk +++ b/maps/DebugRoom.ablk @@ -4,4 +4,4 @@  ! E E@AABHJ~IIIEF|}ABEJ~EF@AAB -DBIIIIJDFTnUDFX5YHIIIJ|}~EEE \ No newline at end of file +DBIIIIJDFTnUDFX5YHIIIJTUTnŠYX|}XYX~EXYEXEXznnnŠ \ No newline at end of file diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index 04d0954..7202316 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -386,7 +386,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, BLUE_FOREST, 1 ; southeast warp + warp_event 33, 33, ONE_ISLAND, 1 ; southeast warp warp_event 5, 3, AZALEA_TOWN, 1 warp_event 34, 11, WINNERS_PATH, 3 diff --git a/maps/OneIsland.ablk b/maps/OneIsland.ablk index eeb5760..f00ce78 100644 Binary files a/maps/OneIsland.ablk and b/maps/OneIsland.ablk differ diff --git a/maps/OneIsland.asm b/maps/OneIsland.asm index 05826c8..15dfdf8 100644 --- a/maps/OneIsland.asm +++ b/maps/OneIsland.asm @@ -9,6 +9,8 @@ OneIsland_MapEvents: db 0, 0 ; filler def_warp_events + warp_event 10, 17, DEBUG_ROOM, 1 + warp_event 11, 17, DEBUG_ROOM, 1 def_coord_events