diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 203b2e5..3fda452 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -573,7 +573,7 @@ ENDM newgroup TWO_ISLAND ; 29 map_const TWO_ISLAND, 20, 9 ; 1 - map_const CAPE_BRINK, 10, 10 ; 2 + map_const CAPE_BRINK, 10, 18 ; 2 endgroup newgroup THREE_ISLAND ; 30 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 7d86496..26cd21e 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -768,8 +768,10 @@ ENDM map_attributes MtEmberSummit, MT_EMBER_SUMMIT, $00, 0 ; Bank 2 map_attributes MtEmberHiddenPath, MT_EMBER_HIDDEN_PATH, $00, 0 ; Bank 2 - map_attributes TwoIsland, TWO_ISLAND, $00, 0 ; Bank 2 - map_attributes CapeBrink, CAPE_BRINK, $00, 0 ; Bank 2 + map_attributes TwoIsland, TWO_ISLAND, $02, NORTH ; Bank 2 + connection north, CapeBrink, CAPE_BRINK, 10 + map_attributes CapeBrink, CAPE_BRINK, $0A, SOUTH ; Bank 2 + connection south, TwoIsland, TWO_ISLAND, -10 map_attributes ThreeIslandPort, THREE_ISLAND_PORT, $02, NORTH ; Bank 2 connection north, ThreeIsland, THREE_ISLAND, 0 diff --git a/data/tilesets/sevii_attributes.bin b/data/tilesets/sevii_attributes.bin index 8b608b9..015b188 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 59db930..b771858 100644 --- a/data/tilesets/sevii_collision.asm +++ b/data/tilesets/sevii_collision.asm @@ -127,3 +127,11 @@ tilecoll WALL, FLOOR, FLOOR, FLOOR ; 7e tilecoll FLOOR, WALL, FLOOR, FLOOR ; 7f tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 80 + tilecoll TALL_GRASS, WALL, TALL_GRASS, WALL ; 81 + tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 82 + tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 83 + tilecoll WALL, WALL, FLOOR, FLOOR ; 84 + tilecoll WALL, WALL, WALL, WALL ; 85 + tilecoll WALL, WALL, WALL, WALL ; 86 + tilecoll WALL, WALL, WALL, WALL ; 87 + tilecoll WALL, WALL, WALL, WALL ; 88 diff --git a/data/tilesets/sevii_metatiles.bin b/data/tilesets/sevii_metatiles.bin index 5495689..9392f03 100644 Binary files a/data/tilesets/sevii_metatiles.bin and b/data/tilesets/sevii_metatiles.bin differ diff --git a/engine/tilesets/tileset_anims.asm b/engine/tilesets/tileset_anims.asm index 7776c14..bf97101 100644 --- a/engine/tilesets/tileset_anims.asm +++ b/engine/tilesets/tileset_anims.asm @@ -244,7 +244,6 @@ TilesetNihonOldAnim: TilesetNihonSouthAnim: TilesetNihonWestAnim: TilesetNihonWhiteCityAnim: -TilesetSeviiAnim: dw vTiles2 tile $14, AnimateWaterTile dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation @@ -292,6 +291,22 @@ TilesetKantoAnim: dw NULL, WaitTileAnimation dw NULL, StandingTileFrame8 dw NULL, DoneTileAnimation + +TilesetSeviiAnim: + dw vTiles2 tile $14, AnimateWaterTile + dw vTiles2 tile $53, ReadTileToAnimBuffer + dw wTileAnimBuffer, ScrollTileDown + dw wTileAnimBuffer, ScrollTileDown + dw vTiles2 tile $53, WriteTileFromAnimBuffer + dw NULL, AnimateWaterPalette + dw NULL, WaitTileAnimation + dw NULL, AnimateFlowerTile + dw vTiles2 tile $53, ReadTileToAnimBuffer + dw wTileAnimBuffer, ScrollTileDown + dw wTileAnimBuffer, ScrollTileDown + dw vTiles2 tile $53, WriteTileFromAnimBuffer + dw NULL, StandingTileFrame8 + dw NULL, DoneTileAnimation TilesetBattleTowerOutsideAnim: TilesetHouseAnim: diff --git a/maps/CapeBrink.ablk b/maps/CapeBrink.ablk index eeb5760..5cf810b 100644 Binary files a/maps/CapeBrink.ablk and b/maps/CapeBrink.ablk differ diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index 97271d5..f396aa9 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -400,11 +400,11 @@ DebugRoom_MapEvents: warp_event 27, 5, PEWTER_CITY, 2 warp_event 15, 2, GOLDENROD_CITY, 1 ; city warp warp_event 4, 9, SUMMER_BEACH_HOUSE, 1 ; left lab/league warp - warp_event 5, 9, ONE_ISLAND, 1 ; right lab/league warp + warp_event 5, 9, BLUE_FOREST, 1 ; right lab/league warp 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, THREE_ISLAND_PORT, 1 ; southeast warp + warp_event 33, 33, TWO_ISLAND, 1 ; southeast warp warp_event 5, 3, HAUNTED_HOUSE_FOYER, 1 warp_event 34, 11, WINNERS_PATH, 3 diff --git a/maps/TwoIsland.ablk b/maps/TwoIsland.ablk index 8cab729..fe1718e 100644 --- a/maps/TwoIsland.ablk +++ b/maps/TwoIsland.ablk @@ -1,16 +1,9 @@ -9=A +9TTC - - - - - - @ - -9=ll=3"07Xpqpr77&#340X(((((mn((! 9\v[(stpo((.)*+9(((X(w((k,,/,,,9><<<<<<<<<<##!30>< +hAT9TllC=3"07Xpqpr77&#340X(((((mn((! 9\v[(stpo((.)*+9(((X(w((k,,/,,,9><<<<<<<<<<##!30>< :<<<<<<<#9@ :<