diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 323748d..6761871 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -577,8 +577,8 @@ ENDM endgroup newgroup THREE_ISLAND ; 30 - map_const THREE_ISLAND_PORT, 10, 10 ; 1 - map_const THREE_ISLAND, 10, 10 ; 2 + map_const THREE_ISLAND_PORT, 20, 9 ; 1 + map_const THREE_ISLAND, 10, 18 ; 2 map_const BOND_BRIDGE, 10, 10 ; 3 map_const BERRY_FOREST, 17, 15 ; 4 endgroup diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index b2fed0b..d6958e3 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -771,8 +771,10 @@ ENDM map_attributes TwoIsland, TWO_ISLAND, $00, 0 ; Bank 2 map_attributes CapeBrink, CAPE_BRINK, $00, 0 ; Bank 2 - map_attributes ThreeIslandPort, THREE_ISLAND_PORT, $00, 0 ; Bank 2 - map_attributes ThreeIsland, THREE_ISLAND, $00, 0 ; Bank 3 + 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 + 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 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index b61201c..08ec49a 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1206,6 +1206,8 @@ AlteringCave_Blocks: ThreeIslandPort_Blocks: INCBIN "maps/ThreeIslandPort.ablk" +SECTION "Map Blocks 4", ROMX + SinjohRuinsExterior_Blocks: INCBIN "maps/SinjohRuinsExterior.ablk" @@ -1239,8 +1241,6 @@ HoneyGrandmasHouse_Blocks: SepiaSchool_Blocks: INCBIN "maps/SepiaSchool.ablk" -SECTION "Map Blocks 4", ROMX - WhiteCity_Blocks: INCBIN "maps/WhiteCity.ablk" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 21e9f29..2585084 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -631,9 +631,9 @@ MapGroup_TwoIsland: ; 29 MapGroup_ThreeIsland: ; 30 table_width MAP_LENGTH, MapGroup_ThreeIsland - map ThreeIslandPort, TILESET_GATE, GATE, LANDMARK_THREE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map ThreeIsland, TILESET_CAVE, TOWN, LANDMARK_THREE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map BondBridge, TILESET_CAVE, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map ThreeIslandPort, TILESET_SEVII, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, 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 assert_table_length NUM_THREE_ISLAND_MAPS diff --git a/data/tilesets/sevii_attributes.bin b/data/tilesets/sevii_attributes.bin index 5026e33..938f914 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 3e5f85f..7e06ce9 100644 --- a/data/tilesets/sevii_collision.asm +++ b/data/tilesets/sevii_collision.asm @@ -118,3 +118,11 @@ tilecoll WATER, WALL, WALL, WALL ; 75 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 76 tilecoll WALL, FLOOR, FLOOR, FLOOR ; 77 + tilecoll WALL, WALL, WALL, FLOOR ; 78 + tilecoll WALL, WALL, FLOOR, WALL ; 79 + tilecoll WALL, WALL, FLOOR, FLOOR ; 7a + tilecoll FLOOR, FLOOR, WALL, WALL ; 7b + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 7c + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 7d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 7e + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 7f diff --git a/data/tilesets/sevii_metatiles.bin b/data/tilesets/sevii_metatiles.bin index 55b5d13..57ee8ec 100644 Binary files a/data/tilesets/sevii_metatiles.bin and b/data/tilesets/sevii_metatiles.bin differ diff --git a/engine/battle/start_battle.asm b/engine/battle/start_battle.asm index 03dc58a..fc2a3bc 100644 --- a/engine/battle/start_battle.asm +++ b/engine/battle/start_battle.asm @@ -78,12 +78,13 @@ PlayBattleMusic: ld de, MUSIC_JOHTO_WILD_BATTLE ld a, [wTimeOfDay] cp NITE_F - jr nz, .done + jr nz, .gotodone ld de, MUSIC_JOHTO_WILD_BATTLE_NIGHT jr .done .kantowild ld de, MUSIC_KANTO_WILD_BATTLE +.gotodone jr .done .trainermusic @@ -140,6 +141,8 @@ PlayBattleMusic: farcall RegionCheck ld a, e + jr nc, .nihontrainer +; ld a, e and a jr nz, .kantotrainer @@ -147,6 +150,10 @@ PlayBattleMusic: ld de, MUSIC_JOHTO_TRAINER_BATTLE jr .done +.nihontrainer + ld de, MUSIC_NIHONTRAINERBATTLE + jr .done + .kantotrainer ld de, MUSIC_KANTO_TRAINER_BATTLE diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index 3501af2..97271d5 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -404,7 +404,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, TWO_ISLAND, 1 ; southeast warp + warp_event 33, 33, THREE_ISLAND_PORT, 1 ; southeast warp warp_event 5, 3, HAUNTED_HOUSE_FOYER, 1 warp_event 34, 11, WINNERS_PATH, 3 diff --git a/maps/ThreeIsland.ablk b/maps/ThreeIsland.ablk index eeb5760..63f2917 100644 Binary files a/maps/ThreeIsland.ablk and b/maps/ThreeIsland.ablk differ diff --git a/maps/ThreeIslandPort.ablk b/maps/ThreeIslandPort.ablk index eeb5760..632eac3 100644 Binary files a/maps/ThreeIslandPort.ablk and b/maps/ThreeIslandPort.ablk differ diff --git a/maps/ThreeIslandPort.asm b/maps/ThreeIslandPort.asm index 507d5a0..06cb97c 100644 --- a/maps/ThreeIslandPort.asm +++ b/maps/ThreeIslandPort.asm @@ -9,6 +9,8 @@ ThreeIslandPort_MapEvents: db 0, 0 ; filler def_warp_events + warp_event 8, 9, DEBUG_ROOM, 1 + warp_event 9, 9, DEBUG_ROOM, 1 def_coord_events