diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 0d987feb9..dc6ce31c1 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -51,6 +51,7 @@ if DEF(_DEBUG) newgroup DEBUGLEVEL_2 map_const DEBUGLEVEL_2_MAP_1, 15, 10 ; 1 + map_const DEBUGLEVEL_2_MAP_2, 5, 5 ; 2 endgroup newgroup DEBUGLEVEL_3 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index a6352268a..4f34b4c95 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -111,7 +111,11 @@ if DEF(_DEBUG) connection south, DebugLevel1_Map1, DEBUGLEVEL_1_MAP_1, 0 connection north, DebugLevel1_Map1, DEBUGLEVEL_1_MAP_1, 0 - map_attributes DebugLevel2_Map1, DEBUGLEVEL_2_MAP_1, $00, 0 + map_attributes DebugLevel2_Map1, DEBUGLEVEL_2_MAP_1, $00, WEST + connection west, DebugLevel2_Map2, DEBUGLEVEL_2_MAP_2, 3 + + map_attributes DebugLevel2_Map2, DEBUGLEVEL_2_MAP_2, $00, EAST + connection east, DebugLevel2_Map1, DEBUGLEVEL_2_MAP_1, -3 map_attributes DebugLevel3_Map1, DEBUGLEVEL_3_MAP_1, $00, 0 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 26594bd44..23f796085 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -10,6 +10,9 @@ INCBIN "maps/DebugLevel1_Map1.blk" DebugLevel2_Map1_Blocks: INCBIN "maps/DebugLevel2_Map1.blk" +DebugLevel2_Map2_Blocks: +INCBIN "maps/DebugLevel2_Map2.blk" + DebugLevel3_Map1_Blocks: INCBIN "maps/DebugLevel3_Map1.blk" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 25327c04c..d80017965 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -48,6 +48,7 @@ MapGroup_DebugLevel1: MapGroup_DebugLevel2: table_width MAP_LENGTH, MapGroup_DebugLevel2 map DebugLevel2_Map1, TILESET_BOARD_DEBUG_2, INDOOR_CAVE, LANDMARK_DEBUGLEVEL_2, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_NITE, FISHGROUP_SHORE + map DebugLevel2_Map2, TILESET_BOARD_DEBUG_2, INDOOR_CAVE, LANDMARK_DEBUGLEVEL_2, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_NITE, FISHGROUP_SHORE assert_table_length NUM_DEBUGLEVEL_2_MAPS MapGroup_DebugLevel3: diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index 1988b12a7..d6715a2f4 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -5,6 +5,7 @@ INCLUDE "maps/Level1_Map1.asm" if DEF(_DEBUG) INCLUDE "maps/DebugLevel1_Map1.asm" INCLUDE "maps/DebugLevel2_Map1.asm" +INCLUDE "maps/DebugLevel2_Map2.asm" INCLUDE "maps/DebugLevel3_Map1.asm" INCLUDE "maps/DebugLevel4_Map1.asm" INCLUDE "maps/DebugLevel5_Map1.asm" diff --git a/data/tilesets/board_debug_2_collision.asm b/data/tilesets/board_debug_2_collision.asm index b33e9bbcc..4f4eb33fd 100755 --- a/data/tilesets/board_debug_2_collision.asm +++ b/data/tilesets/board_debug_2_collision.asm @@ -123,7 +123,7 @@ tilecoll WATER, WATER, WATER, WATER ; 7a tilecoll WALL, WALL, WALL, WALL ; 7b tilecoll WALL, WALL, WALL, WALL ; 7c - tilecoll WALL, WALL, WALL, WALL ; 7d + tilecoll BRANCH_SPACE, FLOOR, FLOOR, FLOOR ; 7d tilecoll BRANCH_SPACE, FLOOR, FLOOR, FLOOR ; 7e tilecoll UNION_SPACE, FLOOR, FLOOR, FLOOR ; 7f tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 80 diff --git a/data/tilesets/board_debug_2_metatiles.bin b/data/tilesets/board_debug_2_metatiles.bin index a156f34e5..fb65e5162 100755 --- a/data/tilesets/board_debug_2_metatiles.bin +++ b/data/tilesets/board_debug_2_metatiles.bin @@ -3,4 +3,4 @@ &  &&67&&67&&&&$$$$*+:;$$$$"#23     ()89       !01     $$&&&&    @@@@@@@@@@@@@@@@%&&&%&&&%&&&%&&&&&&&&&&&&&&&&&&&&&&'&&&'&&&'&&&'67&&67&&$$%&&'%' &&&&&&&&  & 67'67&'&&&&&&&&&&&&%&&&&&&&&&&'&&&  -&&&$$()89IIIIJJJJNO^_JJJJNO^_JJZZZZYYYYZZZZYYYYJJZZZZYYYYLL;;;;====;;;;====;;;KLLL===LLLM;;;KLLL===LLLM\LLL===LLL];;;LLLLLLLL====;;;;LL>?E>?>?>?>?>?>?>?>?>?E>?>?>?>?>?>?>?>?E>?>?>?>?>?>?>?>?>?E>?;;<<;;<<;;<<;;<<<<==<<==<<==<<==<+,,+;<<;;<<;;<<,,-<<<=-<<==<<==;;<<;;<<;KLLKLLL<<==<<==LLM=LLLM<<<<<<<?E>?>?>?>?>?>?>?>?>?E>?>?>?>?>?>?>?>?E>?>?>?>?>?>?>?>?>?E>?;;<<;;<<;;<<;;<<<<==<<==<<==<<==<+,,+;<<;;<<;;<<,,-<<<=-<<==<<==;;<<;;<<;KLLKLLL<<==<<==LLM=LLLM<<<<<<<