diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 6761871..203b2e5 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -579,7 +579,7 @@ ENDM newgroup THREE_ISLAND ; 30 map_const THREE_ISLAND_PORT, 20, 9 ; 1 map_const THREE_ISLAND, 10, 18 ; 2 - map_const BOND_BRIDGE, 10, 10 ; 3 + map_const BOND_BRIDGE, 50, 16 ; 3 map_const BERRY_FOREST, 17, 15 ; 4 endgroup diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index d6958e3..7d86496 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -704,7 +704,7 @@ ENDM map_attributes BellchimeTrail, BELLCHIME_TRAIL, $00, 0 map_attributes PewterMuseumOfScience1F, PEWTER_MUSEUM_OF_SCIENCE_1F, $00, 0 map_attributes PewterMuseumOfScience2F, PEWTER_MUSEUM_OF_SCIENCE_2F, $00, 0 - map_attributes ViridianForest, VIRIDIAN_FOREST, $00, 0 + map_attributes ViridianForest, VIRIDIAN_FOREST, $4D, 0 map_attributes ViridianForestViridianGate, VIRIDIAN_FOREST_VIRIDIAN_GATE, $00, 0 map_attributes ViridianForestPewterGate, VIRIDIAN_FOREST_PEWTER_GATE, $00, 0 map_attributes CeruleanCave1F, CERULEAN_CAVE_1F, $00, 0 @@ -773,10 +773,12 @@ ENDM map_attributes ThreeIslandPort, THREE_ISLAND_PORT, $02, NORTH ; Bank 2 connection north, ThreeIsland, THREE_ISLAND, 0 - map_attributes ThreeIsland, THREE_ISLAND, $03, SOUTH ; Bank 3 + map_attributes ThreeIsland, THREE_ISLAND, $03, SOUTH | WEST ; Bank 3 connection south, ThreeIslandPort, THREE_ISLAND_PORT, 0 - map_attributes BondBridge, BOND_BRIDGE, $00, 0 ; Bank 3 - map_attributes BerryForest, BERRY_FOREST, $00, 0 ; Bank 3 + connection west, BondBridge, BOND_BRIDGE, -3 + map_attributes BondBridge, BOND_BRIDGE, $02, EAST ; Bank 3 + 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 IcefallCaveEntrance, ICEFALL_CAVE_ENTRANCE, $00, 0 ; Bank 3 diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 2585084..8171bec 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -631,10 +631,10 @@ MapGroup_TwoIsland: ; 29 MapGroup_ThreeIsland: ; 30 table_width MAP_LENGTH, MapGroup_ThreeIsland - map ThreeIslandPort, TILESET_SEVII, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map ThreeIslandPort, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map ThreeIsland, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map BondBridge, TILESET_SEVII, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map BerryForest, TILESET_FOREST_KANTO, CAVE, LANDMARK_THREE_ISLAND, MUSIC_ROUTE_3, TRUE, PALETTE_NITE, FISHGROUP_POND + map BerryForest, TILESET_FOREST_KANTO, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_ROUTE_3, TRUE, PALETTE_AUTO, FISHGROUP_POND assert_table_length NUM_THREE_ISLAND_MAPS MapGroup_FourIsland: ; 31 diff --git a/data/tilesets/forest_kanto_attributes.bin b/data/tilesets/forest_kanto_attributes.bin index 3042756..c1c061b 100644 Binary files a/data/tilesets/forest_kanto_attributes.bin and b/data/tilesets/forest_kanto_attributes.bin differ diff --git a/data/tilesets/forest_kanto_collision.asm b/data/tilesets/forest_kanto_collision.asm index f8394eb..e377f6d 100644 --- a/data/tilesets/forest_kanto_collision.asm +++ b/data/tilesets/forest_kanto_collision.asm @@ -75,3 +75,4 @@ tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 4a tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 4b tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 4c + tilecoll WALL, WALL, WALL, WALL ; 4d diff --git a/data/tilesets/forest_kanto_metatiles.bin b/data/tilesets/forest_kanto_metatiles.bin index 63bb5e8..867b234 100644 Binary files a/data/tilesets/forest_kanto_metatiles.bin and b/data/tilesets/forest_kanto_metatiles.bin differ diff --git a/data/tilesets/sevii_attributes.bin b/data/tilesets/sevii_attributes.bin index 938f914..8b608b9 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 7e06ce9..59db930 100644 --- a/data/tilesets/sevii_collision.asm +++ b/data/tilesets/sevii_collision.asm @@ -126,3 +126,4 @@ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 7d tilecoll WALL, FLOOR, FLOOR, FLOOR ; 7e tilecoll FLOOR, WALL, FLOOR, FLOOR ; 7f + tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 80 diff --git a/data/tilesets/sevii_metatiles.bin b/data/tilesets/sevii_metatiles.bin index 57ee8ec..5495689 100644 Binary files a/data/tilesets/sevii_metatiles.bin and b/data/tilesets/sevii_metatiles.bin differ diff --git a/gfx/tilesets/forest_kanto.png b/gfx/tilesets/forest_kanto.png index 9f2e21b..1d0536e 100644 Binary files a/gfx/tilesets/forest_kanto.png and b/gfx/tilesets/forest_kanto.png differ diff --git a/maps/BerryForest.ablk b/maps/BerryForest.ablk index 07d0ed9..ac1e6cd 100644 Binary files a/maps/BerryForest.ablk and b/maps/BerryForest.ablk differ diff --git a/maps/BerryForest.asm b/maps/BerryForest.asm index ca25e4d..1daab1e 100644 --- a/maps/BerryForest.asm +++ b/maps/BerryForest.asm @@ -9,8 +9,8 @@ BerryForest_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 27, 29, DEBUG_ROOM, 1 ; BOND_BRIDGE - warp_event 26, 29, DEBUG_ROOM, 1 ; BOND_BRIDGE + warp_event 27, 29, BOND_BRIDGE, 1 ; BOND_BRIDGE + warp_event 26, 29, BOND_BRIDGE, 2 ; BOND_BRIDGE def_coord_events diff --git a/maps/BondBridge.ablk b/maps/BondBridge.ablk index eeb5760..42d0a35 100644 Binary files a/maps/BondBridge.ablk and b/maps/BondBridge.ablk differ diff --git a/maps/BondBridge.asm b/maps/BondBridge.asm index fe7e227..1dbe900 100644 --- a/maps/BondBridge.asm +++ b/maps/BondBridge.asm @@ -9,6 +9,8 @@ BondBridge_MapEvents: db 0, 0 ; filler def_warp_events + warp_event 9, 8, BERRY_FOREST, 1 ; BOND_BRIDGE + warp_event 8, 8, BERRY_FOREST, 2 ; BOND_BRIDGE def_coord_events diff --git a/maps/ThreeIsland.ablk b/maps/ThreeIsland.ablk index 63f2917..8088ca6 100644 --- a/maps/ThreeIsland.ablk +++ b/maps/ThreeIsland.ablk @@ -1,4 +1,4 @@ -{stst((((((7k(mnkzzy(stprki(((((ki(7ki(stx~i((((ki(77ki(l:<<i(pq:<i(((( +{stst(((((7k(mnkzzy(stprki(((((ki(7ki(stx~i((((ki(77ki(l:<<i(pq:<i(((( st( ( (((((( :;(:< diff --git a/maps/ViridianForest.ablk b/maps/ViridianForest.ablk index fab4f54..ca9be12 100644 Binary files a/maps/ViridianForest.ablk and b/maps/ViridianForest.ablk differ