From 85a616e20e8ba0f5c08c41f9b0c2ddbfc99dac63 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Fri, 6 Oct 2023 20:42:00 +0200 Subject: [PATCH] Create tileset and map in debug build for testing --- constants/map_constants.asm | 2 +- constants/tileset_constants.asm | 3 + data/maps/attributes.asm | 2 +- data/maps/maps.asm | 2 +- data/tilesets.asm | 3 + data/tilesets/board_debug_1_collision.asm | 256 ++++++++++++++++++ data/tilesets/board_debug_1_metatiles.bin | Bin 0 -> 4096 bytes data/tilesets/johto_metatiles.bin | Bin 2048 -> 2048 bytes engine/menus/game_menu.asm | 2 - engine/tilesets/tileset_anims.asm | 3 + gfx/tileset_palette_maps.asm | 5 + gfx/tilesets.asm | 19 +- gfx/tilesets/board_debug_1.png | Bin 0 -> 4583 bytes gfx/tilesets/board_debug_1_palette_map.asm | 32 +++ gfx/tilesets/spaces/fixed_spaces.png | Bin 288 -> 244 bytes .../spaces/fixed_spaces_palette_map.asm | 8 +- gfx/tilesets/spaces/variable_spaces_1.png | Bin 304 -> 244 bytes maps/DebugLevel5_Map1.blk | 2 +- maps/DebugLevel5_Map1.blk.bak | 1 + 19 files changed, 324 insertions(+), 16 deletions(-) create mode 100755 data/tilesets/board_debug_1_collision.asm create mode 100755 data/tilesets/board_debug_1_metatiles.bin create mode 100755 gfx/tilesets/board_debug_1.png create mode 100755 gfx/tilesets/board_debug_1_palette_map.asm create mode 100755 maps/DebugLevel5_Map1.blk.bak diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 0492caee6..c05c5e37f 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -62,7 +62,7 @@ if DEF(_DEBUG) endgroup newgroup DEBUGLEVEL_5 - map_const DEBUGLEVEL_5_MAP_1, 5, 4 ; 1 + map_const DEBUGLEVEL_5_MAP_1, 15, 10 ; 1 endgroup endc diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index 80c0418bd..94ccd1f19 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -36,6 +36,9 @@ const TILESET_KABUTO_WORD_ROOM ; 22 const TILESET_OMANYTE_WORD_ROOM ; 23 const TILESET_AERODACTYL_WORD_ROOM ; 24 +if DEF(_DEBUG) + const TILESET_BOARD_DEBUG_1 ; 25 +endc DEF NUM_TILESETS EQU const_value - 1 ; wTileset struct size diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index ec1e752fc..ee28ac836 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -111,5 +111,5 @@ if DEF(_DEBUG) 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, $00, 0 + map_attributes DebugLevel5_Map1, DEBUGLEVEL_5_MAP_1, $05, 0 endc diff --git a/data/maps/maps.asm b/data/maps/maps.asm index f5530bf80..5098624e7 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -62,6 +62,6 @@ MapGroup_DebugLevel4: MapGroup_DebugLevel5: table_width MAP_LENGTH, MapGroup_DebugLevel5 - map DebugLevel5_Map1, TILESET_JOHTO, OUTDOOR_GRASSY, LANDMARK_DEBUGLEVEL_5, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map DebugLevel5_Map1, TILESET_BOARD_DEBUG_1, OUTDOOR_GRASSY, LANDMARK_DEBUGLEVEL_5, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE assert_table_length NUM_DEBUGLEVEL_5_MAPS endc \ No newline at end of file diff --git a/data/tilesets.asm b/data/tilesets.asm index 1bd635feb..6feed4c69 100644 --- a/data/tilesets.asm +++ b/data/tilesets.asm @@ -51,4 +51,7 @@ Tilesets:: tileset TilesetKabutoWordRoom, 1 tileset TilesetOmanyteWordRoom, 1 tileset TilesetAerodactylWordRoom, 1 +if DEF(_DEBUG) + tileset TilesetBoardDebug1, 1 +endc assert_table_length NUM_TILESETS + 1 diff --git a/data/tilesets/board_debug_1_collision.asm b/data/tilesets/board_debug_1_collision.asm new file mode 100755 index 000000000..427de685d --- /dev/null +++ b/data/tilesets/board_debug_1_collision.asm @@ -0,0 +1,256 @@ + tilecoll 01, 01, 01, 01 ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll LADDER, LADDER, LADDER, LADDER ; 06 + tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 07 + tilecoll WALL, WALL, WALL, WALL ; 08 + tilecoll WALL, WALL, WALL, WALL ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b + tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0d + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll WALL, WALL, WALL, WALL ; 11 + tilecoll WALL, WALL, WALL, WALL ; 12 + tilecoll WALL, WALL, WALL, WALL ; 13 + tilecoll WALL, WALL, WALL, DOOR ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, WALL, DOOR ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll WALL, WALL, WALL, WALL ; 19 + tilecoll WALL, WALL, WALL, DOOR ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1b + tilecoll WALL, WALL, WALL, WALL ; 1c + tilecoll WALL, WALL, DOOR, WALL ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e + tilecoll WALL, WALL, WALL, WALL ; 1f + tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll WALL, WALL, WALL, WALL ; 22 + tilecoll WALL, WALL, WALL, WALL ; 23 + tilecoll WALL, WALL, WALL, WALL ; 24 + tilecoll WALL, WALL, WALL, WALL ; 25 + tilecoll WALL, WALL, WALL, WALL ; 26 + tilecoll WALL, WALL, DOOR, WALL ; 27 + tilecoll WALL, WALL, WALL, DOOR ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2c + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2d + tilecoll WALL, WALL, WALL, DOOR ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll BUOY, BUOY, BUOY, WATER ; 30 + tilecoll BUOY, BUOY, WATER, WATER ; 31 + tilecoll BUOY, BUOY, WATER, BUOY ; 32 + tilecoll FLOOR, FLOOR, WALL, WALL ; 33 + tilecoll BUOY, WATER, BUOY, WATER ; 34 + tilecoll WATER, WATER, WATER, WATER ; 35 + tilecoll WATER, BUOY, WATER, BUOY ; 36 + tilecoll WALL, WALL, WALL, DOOR ; 37 + tilecoll BUOY, WATER, BUOY, BUOY ; 38 + tilecoll WATER, WATER, BUOY, BUOY ; 39 + tilecoll WATER, BUOY, BUOY, BUOY ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3e + tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 3f + tilecoll WALL, WALL, WALL, FLOOR ; 40 + tilecoll WALL, WALL, FLOOR, FLOOR ; 41 + tilecoll WALL, WALL, FLOOR, WALL ; 42 + tilecoll WATER, WATER, WATER, WATER ; 43 + tilecoll WALL, FLOOR, WALL, FLOOR ; 44 + tilecoll WALL, 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 WALL, WALL, WALL, WALL ; 7e + tilecoll WALL, WALL, WALL, WALL ; 7f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 81 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 82 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 83 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 84 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 85 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 86 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 87 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 88 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 89 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 8a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 8b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 8c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 8d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 8e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 8f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 90 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 91 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 92 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 93 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 94 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 95 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 96 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 97 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 98 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 99 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 9a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 9b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 9c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 9d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 9e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 9f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; a0 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; a1 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; a2 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; a3 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; a4 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; a5 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; a6 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; a7 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; a8 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; a9 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; aa + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; ab + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; ac + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; ad + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; ae + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; af + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; b0 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; b1 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; b2 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; b3 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; b4 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; b5 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; b6 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; b7 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; b8 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; b9 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; ba + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; bb + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; bc + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; bd + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; be + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; bf + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; c0 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; c1 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; c2 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; c3 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; c4 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; c5 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; c6 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; c7 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; c8 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; c9 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; ca + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; cb + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; cc + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; cd + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; ce + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; cf + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; d0 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; d1 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; d2 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; d3 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; d4 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; d5 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; d6 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; d7 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; d8 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; d9 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; da + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; db + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; dc + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; dd + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; de + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; df + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; e0 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; e1 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; e2 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; e3 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; e4 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; e5 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; e6 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; e7 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; e8 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; e9 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; ea + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; eb + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; ec + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; ed + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; ee + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; ef + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; f0 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; f1 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; f2 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; f3 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; f4 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; f5 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; f6 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; f7 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; f8 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; f9 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; fa + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; fb + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; fc + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; fd + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; fe + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; ff diff --git a/data/tilesets/board_debug_1_metatiles.bin b/data/tilesets/board_debug_1_metatiles.bin new file mode 100755 index 0000000000000000000000000000000000000000..1c5604c1974ad3c1a59edaeadcd465b11b660d41 GIT binary patch literal 4096 zcmeHI`BM}}6xKD}Yl5Q45_Naktuk>rBuSZAcr3HKL{I{Q2WYZO8T?m*Cg$)&Ss0HW zG?$vgBbSNyecvPz5|4i+-<#%5&kUlqMU^S5eDJpW>-WC*-t_C~88gN!(kH?vFZska zj}znYZ%+G3imnT(Wf<#IbZGMQYCEJ`vNwc_>8WKd2tm`FtJ5%Vx6;Y1=x)YGgsV_6?d-BUL z0kr#)?`@cg_N?S}9(kQd=7)Roy?vHtf!~gBZ55S0`KoHmVqP*_QJL(ks%BokH)>ec zc7x6nog?D05Wgp%??pI^?XzK|T#PZD18s2f=PN4vtg32S1APVPQP8(%9pMwH7D7Y9 zX14O{!276AvhrY_9=#sF|8ex#F6?7+r+Qv(eR5u|)y%d>kBhE!$x@1 zyi|wn!gkFU!Zd|Q!ojV8hFg;$xE0WFtDB4a#dLE4Tisl;ySZdvg&zYO!V35yV3HN_ z9D$Aaju2)ZkIduIA!9<-#p0!9sdQsG2jTP1U1#jK>vO@LrDZ}imNU|$df#*$ZE>Hg z(y~~*u{@R5R>d1BFUM0^bu~#`>~6(1Z+H|RfLSgdd=79!8Te6t4j0X#{_r|lV*s|& zeMUkS6LGZIzGe+XuZ=vTUXifJqQ$29{s*Q>=cmQovBT9TJ1=A6pqGx&-AuywGy6%Y z-kes))0wn5GfeP(ti`v{7P<%Z_eFhY5Zb=$dHkrWt84AY+dldHi}f3}ba!_Hu35M3 z)6X`p-?SNU>*+I6-oB%&IDJNl+jqE&LJYV2{a;}3{uQ<#SFcI=&%b*ApEW*vPRhIe zI{(>oLfq}w{U2`k`~ScA`~@lh{7ctgD86_}%D?Yv{41|8CwA V;^8CR|KWDO{|oHhzvpW|{sVg5Dg*!k literal 0 HcmV?d00001 diff --git a/data/tilesets/johto_metatiles.bin b/data/tilesets/johto_metatiles.bin index 9aa5b1d4fbfee6edac4d580a3515bc8f5d296610..9024f2ad6c761ca47759645ed12017236ed7e208 100644 GIT binary patch delta 16 XcmZn=Xb{-I#XPx*S#7fc^92?FDZB*M delta 19 bcmZn=Xb{-I#msi#U_``&hnoeMKd=A*MluJG diff --git a/engine/menus/game_menu.asm b/engine/menus/game_menu.asm index 12138881f..1f42dcb98 100755 --- a/engine/menus/game_menu.asm +++ b/engine/menus/game_menu.asm @@ -103,8 +103,6 @@ GameMenu_WorldMap: farcall ClearSpriteAnims call ClearSprites - ld a, PLAYER_NORMAL - ld [wPlayerState], a ; this may need to be set on a per-level basis (e.g. if specific level starts with player in surf state) ld a, MAPSETUP_ENTERLEVEL ; jr .SpawnToMap diff --git a/engine/tilesets/tileset_anims.asm b/engine/tilesets/tileset_anims.asm index 4cbe3fba1..d3d120af8 100644 --- a/engine/tilesets/tileset_anims.asm +++ b/engine/tilesets/tileset_anims.asm @@ -78,6 +78,9 @@ TilesetForestAnim: dw NULL, DoneTileAnimation TilesetJohtoAnim: +if DEF(_DEBUG) +TilesetBoardDebug1Anim: +endc dw vTiles2 tile $14, AnimateWaterTile dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation diff --git a/gfx/tileset_palette_maps.asm b/gfx/tileset_palette_maps.asm index 6ae17f0c9..6c15e08e3 100644 --- a/gfx/tileset_palette_maps.asm +++ b/gfx/tileset_palette_maps.asm @@ -116,3 +116,8 @@ INCLUDE "gfx/tilesets/battle_tower_inside_palette_map.asm" TilesetBattleTowerOutsidePalMap: INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm" + +if DEF(_DEBUG) +TilesetBoardDebug1PalMap:: +INCLUDE "gfx/tilesets/board_debug_1_palette_map.asm" +endc diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index 142ca1f49..d1740c76f 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -203,12 +203,6 @@ INCLUDE "data/tilesets/underground_collision.asm" TilesetDarkCaveGFX:: INCBIN "gfx/tilesets/dark_cave.2bpp.lz" -UnusedTilesetJohtoMeta:: ; unreferenced -INCBIN "data/tilesets/unused_johto_metatiles.bin" - -UnusedTilesetJohtoColl:: ; unreferenced -INCLUDE "data/tilesets/unused_johto_collision.asm" - SECTION "Tileset Data 5", ROMX @@ -350,3 +344,16 @@ INCBIN "data/tilesets/omanyte_word_room_metatiles.bin" TilesetAerodactylWordRoomMeta:: INCBIN "data/tilesets/aerodactyl_word_room_metatiles.bin" + +if DEF(_DEBUG) + +TilesetBoardDebug1GFX:: +INCBIN "gfx/tilesets/board_debug_1.2bpp.lz" + +TilesetBoardDebug1Meta:: +INCBIN "data/tilesets/board_debug_1_metatiles.bin" + +TilesetBoardDebug1Coll:: +INCLUDE "data/tilesets/board_debug_1_collision.asm" + +endc diff --git a/gfx/tilesets/board_debug_1.png b/gfx/tilesets/board_debug_1.png new file mode 100755 index 0000000000000000000000000000000000000000..fcc0008fb27970d2c2e8f84c66af206ed00dbeb9 GIT binary patch literal 4583 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 delta 222 zcmV<403rYM0iXhq83+ad007=tcZiW8HGj29L_t(&L+zQt3dA4`M9u!Aex!b+YqGU0 zrBI276lUJV9Go&Oj~-NNtvwA&DY`5(a>w)oHJ@{~HHy}nt=|47fQGLh;KCuU&eka)+fEPy0!K`pUXMxsqg5? zeiZI6yWiK!1?-)0-v=NR4gkghz&HRH2LR&$U>pF91AuV=us(o&8E?3Ny%X;FGaqj0 gOwZrZODB4f8)jVi6!V5}jQ{`u07*qoM6N<$f~7A`-2eap delta 238 zcmV zWk{L~xbVM?U04mD4}vBl>b2H05S3CSj