From 78b8f05fb7dc0f08bfe0abe312dca657f4748350 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Thu, 14 Dec 2023 17:13:07 +0100 Subject: [PATCH] Debug map data for testing --- constants/map_constants.asm | 2 +- constants/space_constants.asm | 0 constants/tileset_constants.asm | 1 + data/maps/attributes.asm | 10 +- data/maps/maps.asm | 4 +- data/maps/spawn_points.asm | 4 +- data/tilesets.asm | 1 + data/tilesets/board_debug_2_collision.asm | 256 +++++++++++++++++++++ data/tilesets/board_debug_2_metatiles.bin | 6 + engine/board/menu.asm | 0 engine/board/spaces.asm | 0 engine/gfx/load_overworld_font.asm | 16 +- engine/tilesets/tileset_anims.asm | 3 + gfx/tileset_palette_maps.asm | 3 + gfx/tilesets.asm | 11 + gfx/tilesets/board_debug_2.png | Bin 0 -> 2921 bytes gfx/tilesets/board_debug_2_palette_map.asm | 33 +++ maps/DebugLevel2_Map1.asm | 22 ++ maps/DebugLevel2_Map1.blk | Bin 20 -> 150 bytes maps/DebugLevel4_Map1.asm | 5 + maps/DebugLevel4_Map1.blk | 2 +- maps/DebugLevel5_Map1.asm | 11 +- maps/DebugLevel5_Map1.blk | 2 +- 23 files changed, 372 insertions(+), 20 deletions(-) mode change 100644 => 100755 constants/space_constants.asm create mode 100755 data/tilesets/board_debug_2_collision.asm create mode 100755 data/tilesets/board_debug_2_metatiles.bin mode change 100644 => 100755 engine/board/menu.asm mode change 100644 => 100755 engine/board/spaces.asm create mode 100755 gfx/tilesets/board_debug_2.png create mode 100755 gfx/tilesets/board_debug_2_palette_map.asm diff --git a/constants/map_constants.asm b/constants/map_constants.asm index c05c5e37f..0d987feb9 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -50,7 +50,7 @@ if DEF(_DEBUG) endgroup newgroup DEBUGLEVEL_2 - map_const DEBUGLEVEL_2_MAP_1, 5, 4 ; 1 + map_const DEBUGLEVEL_2_MAP_1, 15, 10 ; 1 endgroup newgroup DEBUGLEVEL_3 diff --git a/constants/space_constants.asm b/constants/space_constants.asm old mode 100644 new mode 100755 diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index 94ccd1f19..e293bfa0b 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -38,6 +38,7 @@ const TILESET_AERODACTYL_WORD_ROOM ; 24 if DEF(_DEBUG) const TILESET_BOARD_DEBUG_1 ; 25 + const TILESET_BOARD_DEBUG_2 ; 26 endc DEF NUM_TILESETS EQU const_value - 1 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 00559d87f..e36f7190c 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -109,8 +109,14 @@ if DEF(_DEBUG) map_attributes DebugLevel1_Map1, DEBUGLEVEL_1_MAP_1, $00, SOUTH | NORTH 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 DebugLevel3_Map1, DEBUGLEVEL_3_MAP_1, $00, 0 - map_attributes DebugLevel4_Map1, DEBUGLEVEL_4_MAP_1, $00, 0 - map_attributes DebugLevel5_Map1, DEBUGLEVEL_5_MAP_1, $05, 0 + + map_attributes DebugLevel4_Map1, DEBUGLEVEL_4_MAP_1, $05, SOUTH + connection south, DebugLevel5_Map1, DEBUGLEVEL_5_MAP_1, -1 + + map_attributes DebugLevel5_Map1, DEBUGLEVEL_5_MAP_1, $05, NORTH + connection north, DebugLevel4_Map1, DEBUGLEVEL_4_MAP_1, 1 endc diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 5098624e7..25327c04c 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -47,7 +47,7 @@ MapGroup_DebugLevel1: MapGroup_DebugLevel2: table_width MAP_LENGTH, MapGroup_DebugLevel2 - map DebugLevel2_Map1, TILESET_CAVE, INDOOR_CAVE, LANDMARK_DEBUGLEVEL_2, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_NITE | IN_DARKNESS, FISHGROUP_SHORE + map DebugLevel2_Map1, 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: @@ -57,7 +57,7 @@ MapGroup_DebugLevel3: MapGroup_DebugLevel4: table_width MAP_LENGTH, MapGroup_DebugLevel4 - map DebugLevel4_Map1, TILESET_JOHTO, OUTDOOR_GRASSY, LANDMARK_DEBUGLEVEL_4, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map DebugLevel4_Map1, TILESET_BOARD_DEBUG_1, OUTDOOR_GRASSY, LANDMARK_DEBUGLEVEL_4, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE assert_table_length NUM_DEBUGLEVEL_4_MAPS MapGroup_DebugLevel5: diff --git a/data/maps/spawn_points.asm b/data/maps/spawn_points.asm index 396062149..cb7ff15af 100644 --- a/data/maps/spawn_points.asm +++ b/data/maps/spawn_points.asm @@ -12,9 +12,9 @@ SpawnPoints: ; spawn LEVEL_2_MAP_1, 5, 3 ; SPAWN_LEVEL_2 if DEF(_DEBUG) spawn DEBUGLEVEL_1_MAP_1, 3, 3 ; SPAWN_DEBUGLEVEL_1 - spawn DEBUGLEVEL_2_MAP_1, 3, 3 ; SPAWN_DEBUGLEVEL_2 + spawn DEBUGLEVEL_2_MAP_1, 6, 16 ; SPAWN_DEBUGLEVEL_2 spawn DEBUGLEVEL_3_MAP_1, 3, 3 ; SPAWN_DEBUGLEVEL_3 - spawn DEBUGLEVEL_4_MAP_1, 3, 3 ; SPAWN_DEBUGLEVEL_4 + spawn DEBUGLEVEL_4_MAP_1, 4, 6 ; SPAWN_DEBUGLEVEL_4 spawn DEBUGLEVEL_5_MAP_1, 2, 4 ; SPAWN_DEBUGLEVEL_5 endc spawn N_A, -1, -1 diff --git a/data/tilesets.asm b/data/tilesets.asm index 6feed4c69..44bcc6d5b 100644 --- a/data/tilesets.asm +++ b/data/tilesets.asm @@ -53,5 +53,6 @@ Tilesets:: tileset TilesetAerodactylWordRoom, 1 if DEF(_DEBUG) tileset TilesetBoardDebug1, 1 + tileset TilesetBoardDebug2, 1 endc assert_table_length NUM_TILESETS + 1 diff --git a/data/tilesets/board_debug_2_collision.asm b/data/tilesets/board_debug_2_collision.asm new file mode 100755 index 000000000..20dab026f --- /dev/null +++ b/data/tilesets/board_debug_2_collision.asm @@ -0,0 +1,256 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 04 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 05 + tilecoll UP_WALL, WALL, FLOOR, WALL ; 06 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 07 + tilecoll WALL, FLOOR, WALL, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0b + tilecoll WALL, FLOOR, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll WATER, WATER, WATER, WATER ; 0f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 10 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 11 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12 + tilecoll FLOOR, FLOOR, WALL, CAVE ; 13 + tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 14 + tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 15 + tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 16 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, WALL, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, FLOOR, WALL ; 1a + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1f + tilecoll WALL, FLOOR, WALL, WALL ; 20 + tilecoll FLOOR, FLOOR, WALL, WALL ; 21 + tilecoll FLOOR, WALL, WALL, WALL ; 22 + tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 24 + tilecoll WATER, WATER, WATER, WATER ; 25 + tilecoll WATER, WATER, WATER, WATER ; 26 + tilecoll WATER, WATER, WATER, WATER ; 27 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 28 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 29 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2a + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2b + tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d + tilecoll WALL, WALL, WALL, WALL ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 + tilecoll WATER, WATER, WATER, WATER ; 32 + tilecoll WATER, WATER, WATER, WATER ; 33 + tilecoll WALL, WALL, WALL, WALL ; 34 + tilecoll FLOOR, WALL, FLOOR, WALL ; 35 + tilecoll FLOOR, WALL, FLOOR, WALL ; 36 + tilecoll WALL, WALL, WALL, CAVE ; 37 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 38 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 39 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3a + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3b + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3c + tilecoll WATER, WATER, WATER, WATER ; 3d + tilecoll WATER, WATER, WATER, WATER ; 3e + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 3f + tilecoll WALL, UP_WALL, FLOOR, FLOOR ; 40 + tilecoll PIT, FLOOR, FLOOR, FLOOR ; 41 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 42 + tilecoll WATER, WATER, WATER, WATER ; 43 + tilecoll WALL, FLOOR, WALL, FLOOR ; 44 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 45 + tilecoll FLOOR, WALL, FLOOR, WALL ; 46 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 47 + tilecoll WALL, FLOOR, WALL, WALL ; 48 + tilecoll FLOOR, FLOOR, WALL, WALL ; 49 + tilecoll FLOOR, WALL, WALL, WALL ; 4a + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53 + tilecoll WATER, WATER, WATER, WATER ; 54 + tilecoll WATER, WATER, WATER, WATER ; 55 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57 + tilecoll WATER, WATER, WATER, WATER ; 58 + tilecoll WATER, WATER, WATER, WATER ; 59 + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a + tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5b + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5c + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5d + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5e + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 5f + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 60 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 61 + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 62 + tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 63 + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 64 + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65 + tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 66 + tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 67 + tilecoll WALL, FLOOR, WALL, FLOOR ; 68 + tilecoll FLOOR, WALL, FLOOR, WALL ; 69 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a + tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b + tilecoll WALL, FLOOR, WALL, WALL ; 6c + tilecoll FLOOR, WALL, WALL, WALL ; 6d + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71 + tilecoll FLOOR, FLOOR, WALL, WALL ; 72 + tilecoll FLOOR, FLOOR, CAVE, WALL ; 73 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74 + tilecoll WALL, WALL, FLOOR, FLOOR ; 75 + tilecoll WATER, WATER, WATER, WATER ; 76 + tilecoll WALL, WALL, DOOR, WALL ; 77 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 78 + tilecoll WATER, WATER, WATER, WATER ; 79 + 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 ; 7e + tilecoll UNION_SPACE, FLOOR, FLOOR, FLOOR ; 7f + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 80 + tilecoll BLUE_SPACE, FLOOR, WARP_CARPET_DOWN, FLOOR ; 81 + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 82 + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 83 + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 84 + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 85 + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 86 + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 87 + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 88 + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 89 + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 8a + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 8b + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 8c + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 8d + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 8e + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 8f + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 90 + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 91 + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 92 + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 93 + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 94 + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 95 + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 96 + tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 97 + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; 98 + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; 99 + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; 9a + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; 9b + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; 9c + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; 9d + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; 9e + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; 9f + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; a0 + tilecoll POKEMON_SPACE, FLOOR, WARP_CARPET_DOWN, FLOOR ; a1 + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; a2 + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; a3 + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; a4 + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; a5 + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; a6 + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; a7 + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; a8 + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; a9 + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; aa + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; ab + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; ac + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; ad + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; ae + tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; af + tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b0 + tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b1 + tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b2 + tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b3 + tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b4 + tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b5 + tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b6 + tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b7 + tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b8 + tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b9 + tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; ba + tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; bb + tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; bc + tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; bd + tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; be + tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; bf + tilecoll END_SPACE, FLOOR, FLOOR, FLOOR ; c0 + tilecoll GREEN_SPACE, FLOOR, WARP_CARPET_DOWN, FLOOR ; c1 + tilecoll ITEM_SPACE, FLOOR, FLOOR, FLOOR ; c2 + tilecoll MINIGAME_SPACE, FLOOR, FLOOR, FLOOR ; c3 + tilecoll GREEN_SPACE, FLOOR, FLOOR, FLOOR ; c4 + tilecoll GREEN_SPACE, FLOOR, FLOOR, FLOOR ; c5 + tilecoll ITEM_SPACE, FLOOR, FLOOR, FLOOR ; c6 + tilecoll MINIGAME_SPACE, FLOOR, FLOOR, FLOOR ; c7 + tilecoll END_SPACE, FLOOR, FLOOR, FLOOR ; c8 + tilecoll GREEN_SPACE, FLOOR, FLOOR, FLOOR ; c9 + tilecoll ITEM_SPACE, FLOOR, FLOOR, FLOOR ; ca + tilecoll MINIGAME_SPACE, FLOOR, FLOOR, FLOOR ; cb + tilecoll GREEN_SPACE, FLOOR, FLOOR, FLOOR ; cc + tilecoll GREEN_SPACE, FLOOR, FLOOR, FLOOR ; cd + tilecoll ITEM_SPACE, FLOOR, FLOOR, FLOOR ; ce + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; cf + tilecoll END_SPACE, FLOOR, FLOOR, FLOOR ; d0 + tilecoll GREEN_SPACE, FLOOR, FLOOR, FLOOR ; d1 + tilecoll ITEM_SPACE, FLOOR, FLOOR, FLOOR ; d2 + tilecoll MINIGAME_SPACE, FLOOR, FLOOR, FLOOR ; d3 + tilecoll GREEN_SPACE, FLOOR, FLOOR, FLOOR ; d4 + tilecoll GREEN_SPACE, FLOOR, FLOOR, FLOOR ; d5 + tilecoll ITEM_SPACE, FLOOR, FLOOR, FLOOR ; d6 + tilecoll MINIGAME_SPACE, FLOOR, FLOOR, FLOOR ; d7 + tilecoll END_SPACE, FLOOR, FLOOR, FLOOR ; d8 + tilecoll GREEN_SPACE, FLOOR, FLOOR, FLOOR ; d9 + tilecoll ITEM_SPACE, FLOOR, FLOOR, FLOOR ; da + tilecoll MINIGAME_SPACE, FLOOR, FLOOR, FLOOR ; db + tilecoll GREEN_SPACE, FLOOR, FLOOR, FLOOR ; dc + tilecoll GREEN_SPACE, FLOOR, FLOOR, FLOOR ; dd + tilecoll ITEM_SPACE, FLOOR, FLOOR, FLOOR ; de + tilecoll MINIGAME_SPACE, FLOOR, FLOOR, FLOOR ; df + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; e0 + tilecoll GREY_SPACE, FLOOR, WARP_CARPET_DOWN, FLOOR ; e1 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; e2 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; e3 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; e4 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; e5 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; e6 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; e7 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; e8 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; e9 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; ea + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; eb + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; ec + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; ed + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; ee + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; ef + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f0 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f1 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f2 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f3 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f4 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f5 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f6 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f7 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f8 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f9 + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; fa + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; fb + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; fc + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; fd + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; fe + tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; ff diff --git a/data/tilesets/board_debug_2_metatiles.bin b/data/tilesets/board_debug_2_metatiles.bin new file mode 100755 index 000000000..a156f34e5 --- /dev/null +++ b/data/tilesets/board_debug_2_metatiles.bin @@ -0,0 +1,6 @@ +$$$$$$$$*+:;"#23%&&%&&&&&&&&&&&&&'&&&' +& +&  &&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<<<<<<<j#Yf3$RJ0$nfjCDBjR8l!|ljc6-yP2!hqvtWUc@nXW5G|}! zu3VEC4_Qi^TaT^HF~^$O%-GlSXMBJ7eBQ6mkDt#^pFiBMIIAe>C;Oq#zu0%ft&yKWG z^oX>yiMJUX6B84yOd(}uJUD9GT@GQBeC`WDqt?CnA+{!xt_GsKkD`a^*}}j}^%=id z4ZG8tfXJ~N$WyQ4?5*!Tsq{*WPMy&}iMCN=hS1uJUU1tU%|mr~rx+UMzQR5NvCy}1 zY~lXObZ=%4Y`weMMuDy>G`&lcb zHp~1*{ynl*ANc@1Fh#-7y}QnxFNN*nlJd-*bd$L3I=k-7BZVb$;Jzpw{8`U9|FnMX zKD>fWAR8i=(5B+9-Zoxe>N$i%GT0yfvA3ymdNc@fA~4rGG(*Oz3DZ|&%ukFxTf9U* zYxN2{X`f%vnPVX1YX9BHP>Xfw6Gmiw2d@?AOLm>WMWXhw2JGJ&EYFLV$w?CR#H#S? zOM#4GN99D3zF`9(IYZHzWNLYgRjjk9Lql*QbtAzrx;xh%sEXDS-d!&AZ+m>hg&By?YGj~+%)fg0SPILH2$Oi*D z$A&}FnD?~es5?XHP%R<6t}Un-j;at z0Vzp$V*9?4f$Khpc8pTE<)alUL+8(s6Hp<_n;NdV1ql(^9bz-6u+Azd?Lv?S%F{O+ ze#x|}BJdkKG{Y$ikr8!2xKKE?Itt&vrtEgM#dAO~Bs1|u&Y#VCICR+M;IznK@yT9nm}7>ni^?*#gF=8dqDopljja; z$5k%D)C_gS}J`0d8uCQQSH|9H_o!{GHHOYW3)j(8a4TWe}s!mCaFjD-z@DWnaR1?Htg-c z{M00wTuG?qxsK3^N8Zop(uo;2YcME39e@WD5Kd?`C0FQA?RVlGxW+Uyz{B&`VP>AX zo$Rcko-x7DUNXr!bo*tvgIZjSZI@U7L*Pb8d$qunEmj0jZ2-48qxraxwo8lXL6K@7 zJRnzrtJw5Xa2=D@SSk1hdJPk|5SfozF6~R04-&lm6oX%V1>9HkUa#tVd1XOLQ1q!P zI?emG2B=ar$_<8u3NN$~qePK|dg2!HmB6S=c`em}?DN^s*9SlgAo0}6(KkhL^XCs8 zKaExzYTd!wF}iIF_>G9<0PVhy;kpqFa|iz7QY!iQ7z|7$KZ}C8ga61uQ)7+$ZVn_< zBjoxh5TUDo`e#Pq9-a|w+w^zvvzcwGDD>|F(HzQ(*z$5a;o`_j397|$Gw{sU-ywT(_SwBme!jV z8B~Xzlo*Zkzmki~Om)C6giwCX5$Cx>%rC>mw>%ih@kA(*y6NHsEz8hsw@F)k99EfY zkgo3MCN<{`^Stn-&ZSt4Wyrx&uN29 zszZF8KECEE(RJ4E>f#O-+DEDdZG=H)EU4goFaPD{KHrZ%go4dj+|Zz&2P0ux7!4_N z8^)Eq%^^0K1d|$(3*qnwf*mm7Z+7Euffz$feE~3aL-DQ1s&y9b$ zKwj?~#$X#(?gcsgrC@et#3{BR_ULv{m2eJxZ}Y`bj?qD}_kVKB4xID*>Q$QKQikL9 z*3#UCcQT@g8cC!95Iv7&hh85My_-GZ2n`}8SCOGb2q0qs)__p|&>wf1QZd>b-?W0m zR$d~4z%J5}O?lMfH3-WNIW?Ftv37Csy_H20e*v^RiumC@n&MdMug0C=$}(*Q)_5+} zL6~jl(9=Qte9hjK?U1-rLKDhr6C4DiiR0u-IX?=uvQxFzCIbUqN;pi*S+mx)aYcd3J0$cp z2CypoWp)SIvZLKEFVrn#wi{W{s4LQ=b;ww8P1e8yuoxfv{|Y1$g=&*bQ{HACZ{L9p zkIe*8&3q$Q}p%UpTLJ^%@CRizxTC2p}Jys0Z+JUBk5xjIJ6&-dgls zISmByXY_ijn0r?)?R)cVF0CEvRmMC0S!F+>yR{zz#75sYH@PKMng+l+zTa0NtpaI| z))WQ5DGA$r7)f?ep9Y*njFb^#vnX-41+3}s<1JQzxEAMwn>$N9=+-tHHPW$$78JxO;R@6{fn3Xr*y7q@e&efbooIWRC5vC$oV zIbReFgAiPdM)PNkLhW`oM8R^1U;wpoujCOBAhZ)7X7LLq%9(K(=?^NUT|^n%o2((Z zo*(}Xp}mpcU&{3x&5j|S5cH4WKLE*MT2KHK5I_2keZaO00beh#%EiyP*9D53~Eii z=gEB1>fSKE4b;-HBk1P(xY#xLa*%P;W|E(7dBE!v@vHLf$C@_n@u_#Kgktz{&d38er4 literal 20 KcmZQ#!UO;TxBw{t diff --git a/maps/DebugLevel4_Map1.asm b/maps/DebugLevel4_Map1.asm index 10548e5f4..1a86f0fe1 100755 --- a/maps/DebugLevel4_Map1.asm +++ b/maps/DebugLevel4_Map1.asm @@ -9,8 +9,10 @@ DebugLevel4_Map1_MapEvents: db 0, 0 ; filler def_warp_events + warp_event 4, 1, DEBUGLEVEL_2_MAP_1, 1 def_anchor_events + anchor_event 4, 7, 0 def_coord_events @@ -19,3 +21,6 @@ DebugLevel4_Map1_MapEvents: def_object_events DebugLevel4_Map1_MapSpaces: + space 4, 6, $0, 1 ; 0 + space 4, 4, $0, 2 ; 1 + space 4, 2, $0, GO_UP ; 2 diff --git a/maps/DebugLevel4_Map1.blk b/maps/DebugLevel4_Map1.blk index b0a311851..fe212a526 100755 --- a/maps/DebugLevel4_Map1.blk +++ b/maps/DebugLevel4_Map1.blk @@ -1 +1 @@ - \ No newline at end of file +lrsrm \ No newline at end of file diff --git a/maps/DebugLevel5_Map1.asm b/maps/DebugLevel5_Map1.asm index ec752a8fa..e7f3fc043 100755 --- a/maps/DebugLevel5_Map1.asm +++ b/maps/DebugLevel5_Map1.asm @@ -106,7 +106,7 @@ DebugLevel5_Map1_MapSpaces: space 14, 8, $0, 34 ; 34 space 6, 2, $0, 36 ; 35 - space 6, 0, $0, 37 ; 36 + space 6, 0, .BS36 ; 36 space 8, 0, $0, 38 ; 37 space 10, 0, $0, GO_DOWN ; 38 space 12, 0, $0, 40 ; 39 @@ -116,6 +116,11 @@ DebugLevel5_Map1_MapSpaces: space 16, 4, $0, 8 ; 43 .BS2: - branchdir RIGHT, 3, 0 - branchdir UP, 35, 0 + branchdir RIGHT, 3, 0 + branchdir UP, 35, 0 + endbranch + +.BS36: + branchdir RIGHT, 37, 0 + branchdir UP, GO_UP, 0 endbranch diff --git a/maps/DebugLevel5_Map1.blk b/maps/DebugLevel5_Map1.blk index 75022ec65..d7c0fbe9a 100755 --- a/maps/DebugLevel5_Map1.blk +++ b/maps/DebugLevel5_Map1.blk @@ -1 +1 @@ -ā~€À°Á \ No newline at end of file +~ā~€À°Á \ No newline at end of file