From ed84418859d6709b4a3a99a4e4e82737b3616271 Mon Sep 17 00:00:00 2001 From: Alieneer <37123222+BreavyTF2@users.noreply.github.com> Date: Sat, 4 Apr 2026 02:46:09 -0400 Subject: [PATCH 1/2] Tileset Collision .inc files (Pt. 1) Also cleans up collision refs and collision constants. --- constants/collision_constants.asm | 194 +++++++++++-------- constants/map_object_constants.asm | 4 +- data/tilesets/forest_collision.inc | 128 ++++++++++++ data/tilesets/old_city_collision.inc | 128 ++++++++++++ data/tilesets/silent_hill_collision.inc | 128 ++++++++++++ engine/debug/field/change_transportation.inc | 2 +- engine/debug/field/field_cut.inc | 2 +- engine/events/field_moves.asm | 8 +- engine/overworld/map_objects.asm | 2 +- engine/overworld/object_collision.asm | 8 +- engine/overworld/player_movement.asm | 98 +++++----- engine/overworld/player_object.asm | 4 +- engine/overworld/wildmons.asm | 18 +- gfx/gfx.asm | 6 +- home/map.asm | 6 +- 15 files changed, 573 insertions(+), 163 deletions(-) create mode 100644 data/tilesets/forest_collision.inc create mode 100644 data/tilesets/old_city_collision.inc create mode 100644 data/tilesets/silent_hill_collision.inc diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm index 1326ceaf..a1917da3 100644 --- a/constants/collision_constants.asm +++ b/constants/collision_constants.asm @@ -8,10 +8,17 @@ ; What exactly flag means or if it ; means anything is up to Type. ; Old Types: -; ??? +; 0 - Regular 8 - Cuttable +; 1 - ??? 9 - unused +; 2 - Water A - unused +; 3 - ??? B - unused +; 4 - Water 2 C - unused +; 5 - Pits D - unused +; 6 - Warps E - unused +; 7 - Special Talk Act F - unused ; New Types: ; 0 - Regular 8 - ??? -; 1 - Trees, Grass etc. 9 - Special Talk Action +; 1 - Cuttable 9 - Special Talk Action ; 2 - Water A - Jump Action ; 3 - Water 2 B - unused ; 4 - Land C - unused @@ -19,114 +26,132 @@ ; 6 - ??? E - unused ; 7 - Warps F - unused -; TODO: Replace all instances of COLLISION with COLL for consistency with pokegold. +MACRO tilecoll +; used in data/tilesets/*_collision.inc + db COLL_\1, COLL_\2, COLL_\3, COLL_\4 +ENDM -DEF COLLISION_TYPE_MASK EQU $f0 -DEF COLLISION_SUBTYPE_MASK EQU $07 -DEF COLLISION_WATER_SUBTYPE_MASK EQU $03 +DEF COLL_TYPE_MASK EQU $f0 +DEF COLL_SUBTYPE_MASK EQU $07 +DEF COLL_WATER_SUBTYPE_MASK EQU $03 -DEF COLLISION_FLAG EQU $08 +DEF COLL_FLAG EQU $08 ; old collision constants -DEF OLD_HI_NYBBLE_TALL_GRASS EQU $10 -DEF OLD_HI_NYBBLE_WATER EQU $20 +DEF OLD_HI_NYBBLE_WATER EQU $20 DEF OLD_HI_NYBBLE_WATER_ALT EQU $40 - -DEF OLD_COLLISION_WALKABLE EQU $00 -DEF OLD_COLLISION_SOLID EQU $01 -DEF OLD_COLLISION_FLOOR EQU $03 -DEF OLD_COLLISION_WALL EQU $04 - -DEF OLD_COLLISION_LEDGE EQU $11 - -DEF OLD_COLLISION_WATER2_S EQU $40 - -DEF OLD_COLLISION_ROCK EQU $51 - -DEF OLD_COLLISION_CARPET EQU $60 -DEF OLD_COLLISION_DOOR EQU $61 - -DEF OLD_COLLISION_SIGNPOST EQU $70 -DEF OLD_COLLISION_SHOP_SIGN EQU $71 -DEF OLD_COLLISION_MART_ITEM EQU $72 -DEF OLD_COLLISION_COUNTER EQU $73 - -DEF OLD_COLLISION_CUT_TREE EQU $80 -DEF OLD_COLLISION_GRASS EQU $82 +DEF OLD_HI_NYBBLE_PITS EQU $50 +DEF OLD_HI_NYBBLE_WARPS EQU $60 +DEF OLD_HI_NYBBLE_SPECIAL EQU $70 +DEF OLD_HI_NYBBLE_TALL_GRASS EQU $80 + +DEF COLL_OLD_SOLID EQU $01 +DEF COLL_OLD_FLOOR EQU $03 +DEF COLL_OLD_WALL EQU $04 + +; $10 (old) +DEF COLL_OLD_LEDGE EQU $11 + +; water collisions (old) +DEF COLL_OLD_WATER EQU $24 + +; water collisions 2 (old) +DEF COLL_OLD_WATERFALL EQU $40 +DEF COLL_OLD_HOTSPRING EQU $41 +DEF COLL_OLD_42 EQU $42 +DEF COLL_OLD_43 EQU $43 +DEF COLL_OLD_WHIRLPOOL EQU $44 + +; falling warp collisions (old) +DEF COLL_OLD_PIT EQU $50 +DEF COLL_OLD_ROCK EQU $51 + +; warp collisions (old) +DEF COLL_OLD_CARPET EQU $60 +DEF COLL_OLD_DOOR EQU $61 + +; special collisions (old) +DEF COLL_OLD_TOWN_MAP EQU $70 +DEF COLL_OLD_SHOP_SIGN EQU $71 +DEF COLL_OLD_MART_ITEM EQU $72 +DEF COLL_OLD_COUNTER EQU $73 + +; cuttable tiles (old) +DEF COLL_OLD_CUT_TREE EQU $80 +DEF COLL_OLD_GRASS_81 EQU $81 +DEF COLL_OLD_GRASS_82 EQU $82 +DEF COLL_OLD_GRASS_83 EQU $83 + +DEF COLL_OLD_OOB EQU $FF ; first block in every tileset except TILESET_SILENT_HILL. ; new collision constants -DEF COLLISION_WALKABLE EQU $00 -DEF COLLISION_SOLID EQU $07 -DEF COLLISION_08 EQU $08 ; triggers wild encounters -DEF COLLISION_CUT_TREE EQU $12 -DEF COLLISION_GRASS EQU $18 +DEF COLL_FLOOR EQU $00 +DEF COLL_OOB EQU $05 ; first block in TILESET_SILENT_HILL. +DEF COLL_WALL EQU $07 -; water collisions +; cuttable collisions +DEF COLL_GRASS EQU $10 +DEF COLL_CUT_TREE EQU $12 -DEF COLLISION_WATER_21 EQU $21 -DEF COLLISION_WATERFALL EQU $22 -DEF COLLISION_WATER_SOLID EQU $27 -DEF COLLISION_WATER_28 EQU $28 ; triggers wild encounters -DEF COLLISION_WATER EQU $29 +; water collisions +DEF COLL_WATER_20 EQU $20 +DEF COLL_WATER EQU $21 +DEF COLL_WATERFALL EQU $22 +DEF COLL_WATER_SOLID EQU $27 ; water collisions 2 -DEF COLLISION_WATER2_E EQU $30 -DEF COLLISION_WATER2_W EQU $31 -DEF COLLISION_WATER2_N EQU $32 -DEF COLLISION_WATER2_S EQU $33 -; $34..$37 will behave like COLLISION_WATER2_E..COLLISION_WATER2_S +DEF COLL_WATER2_E EQU $30 +DEF COLL_WATER2_W EQU $31 +DEF COLL_WATER2_N EQU $32 +DEF COLL_WATER2_S EQU $33 +; $34..$37 will behave like COLL_WATER2_E..COLL_WATER2_S ; land collisions -DEF COLLISION_LAND_SLOW EQU $40 -DEF COLLISION_LAND_E EQU $41 -DEF COLLISION_LAND_W EQU $42 -DEF COLLISION_LAND_N EQU $43 -DEF COLLISION_LAND_S EQU $44 -; $45..$47 will behave like COLLISION_LAND_E - -; All of these are listed in CheckGrassCollision. That's about all we know. -DEF COLLISION_48 EQU $48 -DEF COLLISION_49 EQU $49 -DEF COLLISION_4A EQU $4A -DEF COLLISION_4B EQU $4B -DEF COLLISION_4C EQU $4C +DEF COLL_LAND_SLOW EQU $40 +DEF COLL_LAND_E EQU $41 +DEF COLL_LAND_W EQU $42 +DEF COLL_LAND_N EQU $43 +DEF COLL_LAND_S EQU $44 +; $45..$47 will behave like COLL_LAND_E ; land collisions 2 -DEF COLLISION_LAND2_E EQU $50 -DEF COLLISION_LAND2_W EQU $51 -DEF COLLISION_LAND2_N EQU $52 -DEF COLLISION_LAND2_S EQU $53 -; $54..$57 will behave like COLLISION_LAND2_E +DEF COLL_LAND2_E EQU $50 +DEF COLL_LAND2_W EQU $51 +DEF COLL_LAND2_N EQU $52 +DEF COLL_LAND2_S EQU $53 +; $54..$57 will behave like COLL_LAND2_E +; falling warp collisions +DEF COLL_PIT EQU $60 ; warp collisions -DEF COLLISION_CARPET EQU $70 -DEF COLLISION_DOOR EQU $71 -DEF COLLISION_STEPS EQU $72 +DEF COLL_CARPET EQU $70 +DEF COLL_DOOR EQU $71 +DEF COLL_STEPS EQU $72 +DEF COLL_CAVE EQU $73 ; special collisions -DEF COLLISION_COUNTER EQU $90 -DEF COLLISION_BOOKCASE EQU $91 -DEF COLLISION_PC EQU $93 -DEF COLLISION_RADIO EQU $94 -DEF COLLISION_SIGNPOST EQU $95 -DEF COLLISION_STRAIGHT_SIGNPOST EQU $97 -DEF COLLISION_COUNTER_98 EQU $98 - +DEF COLL_COUNTER EQU $90 +DEF COLL_BOOKCASE EQU $91 +DEF COLL_92 EQU $92 +DEF COLL_PC EQU $93 +DEF COLL_RADIO EQU $94 +DEF COLL_TOWN_MAP EQU $95 +DEF COLL_STRAIGHT_SIGNPOST EQU $97 ; jump collisions ; perform jump in marked direction, else ; regular walking -DEF COLLISION_JUMP_E EQU $a0 -DEF COLLISION_JUMP_W EQU $a1 -DEF COLLISION_JUMP_N EQU $a2 -DEF COLLISION_JUMP_S EQU $a3 -DEF COLLISION_JUMP_SE EQU $a4 -DEF COLLISION_JUMP_SW EQU $a5 -DEF COLLISION_JUMP_NE EQU $a6 -DEF COLLISION_JUMP_NW EQU $a7 +DEF COLL_JUMP_E EQU $a0 +DEF COLL_JUMP_W EQU $a1 +DEF COLL_JUMP_N EQU $a2 +DEF COLL_JUMP_S EQU $a3 +DEF COLL_JUMP_SE EQU $a4 +DEF COLL_JUMP_SW EQU $a5 +DEF COLL_JUMP_NE EQU $a6 +DEF COLL_JUMP_NW EQU $a7 DEF NEVER_SOLID EQU 0 DEF SOMETIMES_SOLID EQU 1 @@ -139,6 +164,7 @@ DEF HI_NYBBLE_WATER EQU $20 DEF HI_NYBBLE_WATER_ALT EQU $30 ; HI_NYBBLE_CURRENT in final DEF HI_NYBBLE_WALK EQU $40 DEF HI_NYBBLE_WALK_ALT EQU $50 +DEF HI_NYBBLE_PITS EQU $60 DEF HI_NYBBLE_WARPS EQU $70 DEF HI_NYBBLE_SPECIAL EQU $90 DEF HI_NYBBLE_LEDGES EQU $a0 diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm index 5e489342..2e4455e4 100644 --- a/constants/map_object_constants.asm +++ b/constants/map_object_constants.asm @@ -52,9 +52,9 @@ DEF OW_RIGHT EQU RIGHT << 2 shift_const WONT_DELETE ; 1 shift_const FIXED_FACING ; 2 shift_const SLIDING ; 3 - shift_const COLLISION_TILES ; 4 + shift_const COLL_TILES ; 4 shift_const NOCLIP_NOT_SET ; 5 - shift_const COLLISION_OBJS ; 6 + shift_const COLL_OBJS ; 6 shift_const CENTERED_OBJECT ; 7 ; object_struct OBJECT_FLAGS2 bit flags diff --git a/data/tilesets/forest_collision.inc b/data/tilesets/forest_collision.inc new file mode 100644 index 00000000..3dd5a522 --- /dev/null +++ b/data/tilesets/forest_collision.inc @@ -0,0 +1,128 @@ + tilecoll OLD_OOB, OLD_OOB, OLD_OOB, OLD_OOB, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, WALL, + tilecoll FLOOR, TOWN_MAP, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll WALL, WALL, WALL, FLOOR, + tilecoll WALL, WALL, FLOOR, FLOOR, + tilecoll WALL, WALL, FLOOR, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, FLOOR, WALL, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, WALL, FLOOR, WALL, + tilecoll GRASS | COLL_FLAG, GRASS | COLL_FLAG, GRASS | COLL_FLAG, GRASS | COLL_FLAG, + tilecoll WALL, FLOOR, WALL, WALL, + tilecoll FLOOR, FLOOR, WALL, WALL, + tilecoll FLOOR, WALL, WALL, WALL, + tilecoll FLOOR, FLOOR, FLOOR, WALL, + tilecoll WALL, WALL, WALL, FLOOR, + tilecoll WALL, WALL, FLOOR, FLOOR, + tilecoll WALL, WALL, FLOOR, WALL, + tilecoll FLOOR, FLOOR, WALL, FLOOR, + tilecoll WALL, FLOOR, WALL, FLOOR, + tilecoll WALL, WALL, WALL, WALL, + tilecoll FLOOR, WALL, FLOOR, WALL, + tilecoll FLOOR, FLOOR, WALL, WALL, + tilecoll WALL, FLOOR, WALL, WALL, + tilecoll FLOOR, FLOOR, WALL, WALL, + tilecoll FLOOR, WALL, WALL, WALL, + tilecoll WALL, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, WALL, FLOOR, FLOOR, + tilecoll WALL, WALL, WALL, FLOOR, + tilecoll WALL, WALL, FLOOR, WALL, ; garbage data past this point + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WALL, FLOOR, WALL, WALL, + tilecoll FLOOR, WALL, WALL, WALL, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER, WATER, WATER, WATER, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll WATER, WATER, WATER, WATER, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll WATER, WATER, WATER, WATER, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll WATER, WATER, WATER, WATER, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll WATER, WATER, WATER, WATER, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll WATER, WATER, WATER, WATER, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll WATER, WATER, WATER, WATER, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll WATER, WATER, WATER, WATER, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll WATER, WATER, WATER, WATER, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll WATER, WATER, WATER, WATER, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll WATER, WATER, WATER, WATER, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll WATER, WATER, WATER, WATER, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll WATER, WATER, WATER, WATER, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll WATER, WATER, WATER, WATER, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll WATER, WATER, WATER, WATER, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll WATER, WATER, WATER, WATER, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER, WATER, WATER, WATER, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, diff --git a/data/tilesets/old_city_collision.inc b/data/tilesets/old_city_collision.inc new file mode 100644 index 00000000..55e2142f --- /dev/null +++ b/data/tilesets/old_city_collision.inc @@ -0,0 +1,128 @@ + tilecoll OLD_OOB, OLD_OOB, OLD_OOB, OLD_OOB, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_TOWN_MAP, OLD_SOLID, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll OLD_SOLID, OLD_DOOR, FLOOR, FLOOR, + tilecoll OLD_TOWN_MAP, OLD_SOLID, FLOOR, FLOOR, + tilecoll OLD_TOWN_MAP, FLOOR, FLOOR, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, FLOOR, FLOOR, + tilecoll OLD_DOOR, OLD_SOLID, FLOOR, FLOOR, + tilecoll OLD_SOLID, OLD_DOOR, OLD_TOWN_MAP, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, FLOOR, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_DOOR, OLD_DOOR, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, FLOOR, OLD_SOLID, + tilecoll OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, + tilecoll OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, + tilecoll OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, FLOOR, + tilecoll OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, + tilecoll OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, + tilecoll OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, FLOOR, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, FLOOR, OLD_SOLID, + tilecoll FLOOR, FLOOR, OLD_TOWN_MAP, OLD_SOLID, + tilecoll OLD_SOLID, FLOOR, OLD_SOLID, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll FLOOR, OLD_SOLID, FLOOR, OLD_SOLID, + tilecoll OLD_TOWN_MAP, OLD_SOLID, FLOOR, FLOOR, + tilecoll OLD_SOLID, FLOOR, OLD_SOLID, OLD_SOLID, + tilecoll FLOOR, FLOOR, OLD_SOLID, OLD_SOLID, + tilecoll FLOOR, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, FLOOR, OLD_CUT_TREE, + tilecoll OLD_CUT_TREE, OLD_SOLID, FLOOR, OLD_SOLID, + tilecoll OLD_SOLID, OLD_CUT_TREE, FLOOR, FLOOR, + tilecoll FLOOR, OLD_CUT_TREE, FLOOR, OLD_SOLID, + tilecoll OLD_SOLID, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, OLD_SOLID, + tilecoll FLOOR, FLOOR, OLD_LEDGE, OLD_LEDGE, + tilecoll FLOOR, FLOOR, FLOOR, OLD_LEDGE, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, FLOOR, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, FLOOR, OLD_SOLID, + tilecoll OLD_GRASS_83 | COLL_FLAG, OLD_GRASS_83 | COLL_FLAG, OLD_GRASS_83 | COLL_FLAG, OLD_GRASS_83 | COLL_FLAG, + tilecoll OLD_SOLID, FLOOR, OLD_SOLID, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, FLOOR, + tilecoll FLOOR, OLD_SOLID, FLOOR, OLD_SOLID, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll OLD_SOLID, FLOOR, OLD_SOLID, OLD_SOLID, + tilecoll FLOOR, FLOOR, OLD_SOLID, OLD_SOLID, + tilecoll FLOOR, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll FLOOR, OLD_SOLID, FLOOR, OLD_CUT_TREE, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, FLOOR, FLOOR, + tilecoll OLD_DOOR, OLD_DOOR, FLOOR, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll OLD_CARPET, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_CARPET, OLD_CARPET, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_CARPET, OLD_SOLID, OLD_SOLID, + tilecoll OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_DOOR, OLD_DOOR, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll WATER, WATER, WATER, WATER, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll WATER, WATER, WATER, WATER, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_DOOR, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_DOOR, OLD_SOLID, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll OLD_SOLID, FLOOR, OLD_SOLID, OLD_SOLID, + tilecoll FLOOR, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, OLD_DOOR, OLD_SOLID, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_CUT_TREE, FLOOR, FLOOR, + tilecoll OLD_CUT_TREE, OLD_SOLID, FLOOR, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_DOOR, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_DOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, + tilecoll OLD_SOLID, OLD_SOLID, OLD_DOOR, OLD_SOLID, diff --git a/data/tilesets/silent_hill_collision.inc b/data/tilesets/silent_hill_collision.inc new file mode 100644 index 00000000..f4010947 --- /dev/null +++ b/data/tilesets/silent_hill_collision.inc @@ -0,0 +1,128 @@ + tilecoll OOB, OOB, OOB, OOB, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll WALL, WALL, WALL, WALL, + tilecoll TOWN_MAP, WALL, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll WALL, DOOR, FLOOR, FLOOR, + tilecoll TOWN_MAP, WALL, FLOOR, FLOOR, + tilecoll TOWN_MAP, FLOOR, FLOOR, FLOOR, + tilecoll WALL, WALL, WALL, DOOR, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, DOOR, WALL, + tilecoll WALL, DOOR, FLOOR, FLOOR, + tilecoll WALL, WALL, FLOOR, FLOOR, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, DOOR, DOOR, + tilecoll WALL, WALL, WALL, WALL, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER | COLL_FLAG, WATER | COLL_FLAG, WATER | COLL_FLAG, WATER | COLL_FLAG, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WALL, WALL, WALL, FLOOR, + tilecoll WALL, WALL, FLOOR, FLOOR, + tilecoll WALL, WALL, FLOOR, WALL, + tilecoll FLOOR, FLOOR, TOWN_MAP, WALL, + tilecoll WALL, FLOOR, WALL, FLOOR, + tilecoll WALL, WALL, WALL, WALL, + tilecoll FLOOR, WALL, FLOOR, WALL, + tilecoll TOWN_MAP, WALL, FLOOR, FLOOR, + tilecoll WALL, FLOOR, WALL, WALL, + tilecoll FLOOR, FLOOR, WALL, WALL, + tilecoll FLOOR, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, FLOOR, CUT_TREE, + tilecoll CUT_TREE, WALL, FLOOR, WALL, + tilecoll WALL, CUT_TREE, FLOOR, FLOOR, + tilecoll FLOOR, CUT_TREE, FLOOR, WALL, + tilecoll WALL, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, WALL, + tilecoll JUMP_S, JUMP_S, WALL, WALL, + tilecoll FLOOR, JUMP_S, FLOOR, WALL, + tilecoll WALL, WALL, WALL, FLOOR, + tilecoll WALL, WALL, FLOOR, FLOOR, + tilecoll WALL, WALL, FLOOR, WALL, + tilecoll GRASS | COLL_FLAG, GRASS | COLL_FLAG, GRASS | COLL_FLAG, GRASS | COLL_FLAG, + tilecoll WALL, FLOOR, WALL, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, WALL, FLOOR, WALL, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll WALL, FLOOR, WALL, WALL, + tilecoll FLOOR, FLOOR, WALL, WALL, + tilecoll FLOOR, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, DOOR, DOOR, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, DOOR, + tilecoll WALL, CUT_TREE, FLOOR, FLOOR, + tilecoll WALL, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, WALL, WALL, WALL, + tilecoll PIT, PIT, WALL, WALL, + tilecoll WALL, FLOOR, WALL, WALL, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WATER, WATER, WATER, WATER, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, DOOR, DOOR, + tilecoll WALL, WALL, WALL, WALL, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll WALL, WALL, WALL, DOOR, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, DOOR, WALL, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll PIT, FLOOR, FLOOR, PIT, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, DOOR, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, DOOR, + tilecoll WALL, WALL, TOWN_MAP, WALL, + tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL, + tilecoll OLD_HOTSPRING | COLL_FLAG, OLD_HOTSPRING | COLL_FLAG, OLD_HOTSPRING | COLL_FLAG, OLD_HOTSPRING | COLL_FLAG, + tilecoll WALL, WALL, WALL, DOOR, + tilecoll WALL, WALL, TOWN_MAP, WALL, + tilecoll WALL, WALL, DOOR, DOOR, + tilecoll WALL, WALL, WALL, CAVE, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, + tilecoll WALL, WALL, WALL, WALL, diff --git a/engine/debug/field/change_transportation.inc b/engine/debug/field/change_transportation.inc index c8b51d1d..c8747837 100644 --- a/engine/debug/field/change_transportation.inc +++ b/engine/debug/field/change_transportation.inc @@ -134,7 +134,7 @@ TransportationList: FieldDebug_CheckFacingSurfable: push af call GetFacingTileCoord - and COLLISION_TYPE_MASK + and COLL_TYPE_MASK cp OLD_HI_NYBBLE_WATER ; happens to match HI_NYBBLE_WATER jr z, .surfable cp OLD_HI_NYBBLE_WATER_ALT diff --git a/engine/debug/field/field_cut.inc b/engine/debug/field/field_cut.inc index d8b733d0..91b23a52 100644 --- a/engine/debug/field/field_cut.inc +++ b/engine/debug/field/field_cut.inc @@ -53,7 +53,7 @@ FieldDebug_FieldCut: .IsCollision: ; broken call GetFacingTileCoord - cp OLD_COLLISION_CUT_TREE + cp COLL_OLD_CUT_TREE ret .IsCuttableTile: diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index 4a40fd73..6a86a1ab 100644 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -123,10 +123,10 @@ IsCuttableTile: ret CuttableTiles: - db $81 - db $82 - db $8A - db $8B + db COLL_OLD_GRASS_81 + db COLL_OLD_GRASS_82 + db COLL_OLD_GRASS_82 | COLL_FLAG + db COLL_OLD_GRASS_83 | COLL_FLAG db -1 FailCut: diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 5b6b85fc..ebc57d24 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -237,7 +237,7 @@ UpdateTallGrassFlags: ; This entire function was blanked out for the final game. See 'UselessAndA' in pokegold. ResetObjFlags2_7: ; This comparison is pointless because the instructions below it have been nop'd out. - and COLLISION_TYPE_MASK + and COLL_TYPE_MASK cp HI_NYBBLE_WARPS nop nop diff --git a/engine/overworld/object_collision.asm b/engine/overworld/object_collision.asm index 8cec1b42..d1cabfab 100644 --- a/engine/overworld/object_collision.asm +++ b/engine/overworld/object_collision.asm @@ -5,7 +5,7 @@ SECTION "engine/overworld/object_collision.asm", ROMX CanObjectMoveInDirection: ld hl, OBJECT_FLAGS1 add hl, bc - bit COLLISION_TILES_F, [hl] + bit COLL_TILES_F, [hl] jr z, .noclip_tiles push hl call _IsObjectCollisionTileSolid @@ -13,7 +13,7 @@ CanObjectMoveInDirection: ret c .noclip_tiles - bit COLLISION_OBJS_F, [hl] + bit COLL_OBJS_F, [hl] jr z, .noclip_objs push hl push bc @@ -66,9 +66,9 @@ _IsObjectCollisionTileSolid: CheckFacingObject: call GetFacingTileCoord - cp COLLISION_COUNTER + cp COLL_COUNTER jr z, .counter - cp COLLISION_COUNTER_98 + cp (COLL_COUNTER | COLL_FLAG) jr nz, .not_counter .counter ld a, [wPlayerMapX] diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index d199eebf..ac67bb69 100644 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -107,7 +107,7 @@ _CheckMovementWalkOrBike: jr c, .face_down call IsPlayerCollisionTileSolid jr nc, .move_down - cp OLD_COLLISION_LEDGE + cp COLL_OLD_LEDGE jr nz, .face_down ld a, movement_jump_step | DOWN ret @@ -248,9 +248,9 @@ CheckSkateDown: jr c, .collision call IsPlayerCollisionTileSolid jr nc, .can_skate - cp OLD_COLLISION_LEDGE + cp COLL_OLD_LEDGE jr z, .jump - cp (OLD_COLLISION_ROCK | COLLISION_FLAG) + cp (COLL_OLD_ROCK | COLL_FLAG) jr nz, .collision .jump @@ -283,7 +283,7 @@ CheckSkateUp: jr c, .collision call IsPlayerCollisionTileSolid jr nc, .can_skate - cp (OLD_COLLISION_ROCK | COLLISION_FLAG) + cp (COLL_OLD_ROCK | COLL_FLAG) jr nz, .collision ld a, movement_fast_jump_step | UP ret @@ -314,7 +314,7 @@ CheckSkateLeft: jr c, .collision call IsPlayerCollisionTileSolid jr nc, .can_skate - cp (OLD_COLLISION_ROCK | COLLISION_FLAG) + cp (COLL_OLD_ROCK | COLL_FLAG) jr nz, .collision ld a, movement_fast_jump_step | LEFT ret @@ -345,7 +345,7 @@ CheckSkateRight: jr c, .collision call IsPlayerCollisionTileSolid jr nc, .can_skate - cp (OLD_COLLISION_ROCK | COLLISION_FLAG) + cp (COLL_OLD_ROCK | COLL_FLAG) jr nz, .collision ld a, movement_fast_jump_step | RIGHT ret @@ -372,13 +372,13 @@ OldIsTileCollisionGrass:: ; Result: ; nz - not grass ; z - grass - cp $82 + cp COLL_OLD_GRASS_82 ret z - cp $83 + cp COLL_OLD_GRASS_83 ret z - cp $8a + cp (COLL_OLD_GRASS_82 | COLL_FLAG) ret z - cp $8b + cp (COLL_OLD_GRASS_83 | COLL_FLAG) ret OldCheckMovementSurf:: @@ -490,7 +490,7 @@ OldIsTileCollisionWater:: ; Result: ; c - water ; nc - not water - and COLLISION_TYPE_MASK + and COLL_TYPE_MASK cp OLD_HI_NYBBLE_WATER ret z cp OLD_HI_NYBBLE_WATER_ALT @@ -593,7 +593,7 @@ GetPlayerMovementByState: CheckMovementWalk:: ld a, [wPlayerTile] swap a - and COLLISION_TYPE_MASK >> 4 + and COLL_TYPE_MASK >> 4 ld hl, .WalkingCollisionTable jp CallJumptable @@ -624,7 +624,7 @@ CheckMovementWalkSolid:: CheckMovementWalkLand:: ld a, [wPlayerTile] - and COLLISION_SUBTYPE_MASK + and COLL_SUBTYPE_MASK jr nz, .force_movement call CheckMovementWalkRegular call SlowDownMovementWalk @@ -632,18 +632,18 @@ CheckMovementWalkLand:: .force_movement ld b, movement_step | DOWN - cp (COLLISION_LAND_S & COLLISION_SUBTYPE_MASK) + cp (COLL_LAND_S & COLL_SUBTYPE_MASK) jr z, .finish ld b, movement_step | UP - cp (COLLISION_LAND_N & COLLISION_SUBTYPE_MASK) + cp (COLL_LAND_N & COLL_SUBTYPE_MASK) jr z, .finish ld b, movement_step | LEFT - cp (COLLISION_LAND_W & COLLISION_SUBTYPE_MASK) + cp (COLL_LAND_W & COLL_SUBTYPE_MASK) jr z, .finish ld b, movement_step | RIGHT - cp (COLLISION_LAND_E & COLLISION_SUBTYPE_MASK) + cp (COLL_LAND_E & COLL_SUBTYPE_MASK) jr z, .finish - ; fall-through --> map other codes to COLLISION_LAND_E + ; fall-through --> map other codes to COLL_LAND_E .finish ld a, b ret @@ -668,20 +668,20 @@ SlowDownMovementWalk: CheckMovementWalkLand2:: ld a, [wPlayerTile] - and COLLISION_SUBTYPE_MASK + and COLL_SUBTYPE_MASK ld b, movement_step | DOWN - cp (COLLISION_LAND2_S & COLLISION_SUBTYPE_MASK) + cp (COLL_LAND2_S & COLL_SUBTYPE_MASK) jr z, .finish ld b, movement_step | UP - cp (COLLISION_LAND2_N & COLLISION_SUBTYPE_MASK) + cp (COLL_LAND2_N & COLL_SUBTYPE_MASK) jr z, .finish ld b, movement_step | LEFT - cp (COLLISION_LAND2_W & COLLISION_SUBTYPE_MASK) + cp (COLL_LAND2_W & COLL_SUBTYPE_MASK) jr z, .finish ld b, movement_step | RIGHT - cp (COLLISION_LAND2_E & COLLISION_SUBTYPE_MASK) + cp (COLL_LAND2_E & COLL_SUBTYPE_MASK) jr z, .finish - ; fall-through --> map other codes to COLLISION_LAND2_E + ; fall-through --> map other codes to COLL_LAND2_E .finish ld a, b ret @@ -691,7 +691,7 @@ UnusedCheckMovementWalk60:: CheckMovementWalkWarp:: ld a, [wPlayerTile] - and COLLISION_SUBTYPE_MASK + and COLL_SUBTYPE_MASK jr z, .check_dpad cp 1 jr z, .move_down @@ -779,12 +779,12 @@ CheckMovementWalkJump: .down ld a, [wPlayerTile] - and COLLISION_SUBTYPE_MASK - cp (COLLISION_JUMP_S & COLLISION_SUBTYPE_MASK) + and COLL_SUBTYPE_MASK + cp (COLL_JUMP_S & COLL_SUBTYPE_MASK) jr z, .jump_down - cp (COLLISION_JUMP_SE & COLLISION_SUBTYPE_MASK) + cp (COLL_JUMP_SE & COLL_SUBTYPE_MASK) jr z, .jump_down - cp (COLLISION_JUMP_SW & COLLISION_SUBTYPE_MASK) + cp (COLL_JUMP_SW & COLL_SUBTYPE_MASK) jr z, .jump_down jp CheckWalkDown .jump_down @@ -793,12 +793,12 @@ CheckMovementWalkJump: .up ld a, [wPlayerTile] - and COLLISION_SUBTYPE_MASK - cp (COLLISION_JUMP_N & COLLISION_SUBTYPE_MASK) + and COLL_SUBTYPE_MASK + cp (COLL_JUMP_N & COLL_SUBTYPE_MASK) jr z, .jump_up - cp (COLLISION_JUMP_NE & COLLISION_SUBTYPE_MASK) + cp (COLL_JUMP_NE & COLL_SUBTYPE_MASK) jr z, .jump_up - cp (COLLISION_JUMP_NW & COLLISION_SUBTYPE_MASK) + cp (COLL_JUMP_NW & COLL_SUBTYPE_MASK) jr z, .jump_up jp CheckWalkUp .jump_up @@ -807,12 +807,12 @@ CheckMovementWalkJump: .left ld a, [wPlayerTile] - and COLLISION_SUBTYPE_MASK - cp (COLLISION_JUMP_W & COLLISION_SUBTYPE_MASK) + and COLL_SUBTYPE_MASK + cp (COLL_JUMP_W & COLL_SUBTYPE_MASK) jr z, .jump_left - cp (COLLISION_JUMP_SW & COLLISION_SUBTYPE_MASK) + cp (COLL_JUMP_SW & COLL_SUBTYPE_MASK) jr z, .jump_left - cp (COLLISION_JUMP_NW & COLLISION_SUBTYPE_MASK) + cp (COLL_JUMP_NW & COLL_SUBTYPE_MASK) jr z, .jump_left jp CheckWalkLeft .jump_left @@ -821,12 +821,12 @@ CheckMovementWalkJump: .right ld a, [wPlayerTile] - and COLLISION_SUBTYPE_MASK - cp (COLLISION_JUMP_E & COLLISION_SUBTYPE_MASK) + and COLL_SUBTYPE_MASK + cp (COLL_JUMP_E & COLL_SUBTYPE_MASK) jr z, .jump_right - cp (COLLISION_JUMP_SE & COLLISION_SUBTYPE_MASK) + cp (COLL_JUMP_SE & COLL_SUBTYPE_MASK) jr z, .jump_right - cp (COLLISION_JUMP_NE & COLLISION_SUBTYPE_MASK) + cp (COLL_JUMP_NE & COLL_SUBTYPE_MASK) jr z, .jump_right jp CheckWalkRight .jump_right @@ -892,7 +892,7 @@ CheckWalkRight:: CheckMovementSurf:: ld a, [wPlayerTile] swap a - and COLLISION_TYPE_MASK >> 4 + and COLL_TYPE_MASK >> 4 ld hl, .SurfCollisionTable jp CallJumptable @@ -928,8 +928,8 @@ CheckMovementSurfRegular:: CheckMovementSurfWater:: ld a, [wPlayerTile] - and COLLISION_SUBTYPE_MASK - cp (COLLISION_WATERFALL & COLLISION_SUBTYPE_MASK) + and COLL_SUBTYPE_MASK + cp (COLL_WATERFALL & COLL_SUBTYPE_MASK) jr nz, CheckMovementSurfRegular ; waterfall ld a, movement_big_step | DOWN @@ -937,17 +937,17 @@ CheckMovementSurfWater:: CheckMovementSurfWater2:: ld a, [wPlayerTile] - and COLLISION_WATER_SUBTYPE_MASK + and COLL_WATER_SUBTYPE_MASK ld d, movement_step | RIGHT - jr z, .finish ; COLLISION_WATER2_E + jr z, .finish ; COLL_WATER2_E ld d, movement_step | LEFT - cp (COLLISION_WATER2_W & COLLISION_WATER_SUBTYPE_MASK) + cp (COLL_WATER2_W & COLL_WATER_SUBTYPE_MASK) jr z, .finish ld d, movement_step | UP - cp (COLLISION_WATER2_N & COLLISION_WATER_SUBTYPE_MASK) + cp (COLL_WATER2_N & COLL_WATER_SUBTYPE_MASK) jr z, .finish ld d, movement_step | DOWN - cp (COLLISION_WATER2_S & COLLISION_WATER_SUBTYPE_MASK) + cp (COLL_WATER2_S & COLL_WATER_SUBTYPE_MASK) jr z, .finish ; fall-through --> no aliasing due to mask .finish diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index bc29ceeb..2433991d 100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -292,7 +292,7 @@ CopyMapObjectToObjectStruct:: InitObjectFlags:: ld hl, OBJECT_FLAGS1 add hl, de - ld [hl], COLLISION_OBJS | NOCLIP_NOT_SET | COLLISION_TILES + ld [hl], COLL_OBJS | NOCLIP_NOT_SET | COLL_TILES ldh a, [hObjectStructIndex] push hl ld hl, wCenteredObject @@ -316,7 +316,7 @@ InitObjectFlags:: ldh a, [hObjectStructIndex] cp PLAYER_OBJECT_INDEX ret z - set COLLISION_TILES_F, [hl] + set COLL_TILES_F, [hl] ret CopyMapObject_Radius: diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index 3641bed7..b38d414c 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -226,15 +226,15 @@ TryWildBattle:: ret .blocks - db COLLISION_08 - db COLLISION_GRASS - db COLLISION_WATER_28 - db COLLISION_WATER - db COLLISION_48 - db COLLISION_49 - db COLLISION_4A - db COLLISION_4B - db COLLISION_4C + db COLL_FLOOR | COLL_FLAG + db COLL_GRASS | COLL_FLAG + db COLL_WATER_20 | COLL_FLAG + db COLL_WATER | COLL_FLAG + db COLL_OLD_WATERFALL | COLL_FLAG + db COLL_OLD_HOTSPRING | COLL_FLAG + db COLL_OLD_42 | COLL_FLAG + db COLL_OLD_43 | COLL_FLAG + db COLL_OLD_WHIRLPOOL | COLL_FLAG db -1 INCLUDE "data/wild/probabilities.inc" diff --git a/gfx/gfx.asm b/gfx/gfx.asm index 3e903e34..2f8a2119 100644 --- a/gfx/gfx.asm +++ b/gfx/gfx.asm @@ -108,13 +108,13 @@ INCBIN "gfx/tilesets/silent_hill.common.2bpp" SilentHill_Meta: INCBIN "data/tilesets/silent_hill_metatiles.bin" SilentHill_Coll: -INCBIN "data/tilesets/silent_hill_collision.bin" +INCLUDE "data/tilesets/silent_hill_collision.inc" SECTION "gfx.asm@Bank 6 Tilesets Forest", ROMX Forest_Meta: INCBIN "data/tilesets/forest_metatiles.bin" Forest_Coll: -INCBIN "data/tilesets/forest_collision.bin" +INCLUDE "data/tilesets/forest_collision.inc" SECTION "gfx.asm@Bank 6 Tilesets Old City", ROMX OldCity_GFX: @@ -122,7 +122,7 @@ INCBIN "gfx/tilesets/old_city.common.2bpp" OldCity_Meta: INCBIN "data/tilesets/old_city_metatiles.bin" OldCity_Coll: -INCBIN "data/tilesets/old_city_collision.bin" +INCLUDE "data/tilesets/old_city_collision.inc" SECTION "gfx.asm@Bank 6 Tilesets West", ROMX West_GFX: diff --git a/home/map.asm b/home/map.asm index db400306..0cd54b26 100644 --- a/home/map.asm +++ b/home/map.asm @@ -454,13 +454,13 @@ Function2407:: and %00001100 ld [wPlayerFacing], a ld a, [wPlayerTile] - and COLLISION_TYPE_MASK + and COLL_TYPE_MASK cp HI_NYBBLE_WARPS ret nz ld a, [wPlayerTile] - cp COLLISION_STEPS + cp COLL_STEPS ret z - cp COLLISION_CARPET + cp COLL_CARPET ret z cp $78 ret z From dc2cfc5907cb0ac5af0a9b47d8fba83c4f22d2d3 Mon Sep 17 00:00:00 2001 From: Alieneer <37123222+BreavyTF2@users.noreply.github.com> Date: Mon, 6 Apr 2026 16:25:44 -0400 Subject: [PATCH 2/2] Tileset Collision .inc files (Pt. 2) --- constants/collision_constants.asm | 103 ++++--- constants/map_object_constants.asm | 4 +- data/tilesets/aquarium_collision.bin | Bin 256 -> 0 bytes data/tilesets/aquarium_collision.inc | 64 +++++ data/tilesets/baadon_collision.bin | Bin 512 -> 0 bytes data/tilesets/baadon_collision.inc | 128 +++++++++ data/tilesets/bull_forest_collision.bin | Bin 512 -> 0 bytes data/tilesets/bull_forest_collision.inc | 128 +++++++++ data/tilesets/cave_collision.bin | Bin 512 -> 0 bytes data/tilesets/cave_collision.inc | 128 +++++++++ data/tilesets/dept_store_collision.bin | Bin 256 -> 0 bytes data/tilesets/dept_store_collision.inc | 64 +++++ data/tilesets/fonto_collision.bin | Bin 512 -> 0 bytes data/tilesets/fonto_collision.inc | 129 +++++++++ data/tilesets/forest_collision.bin | Bin 512 -> 0 bytes data/tilesets/forest_collision.inc | 192 ++++++------- data/tilesets/gate_collision.bin | Bin 256 -> 0 bytes data/tilesets/gate_collision.inc | 64 +++++ data/tilesets/gym_collision.bin | Bin 512 -> 0 bytes data/tilesets/gym_collision.inc | 128 +++++++++ data/tilesets/haiteku_collision.bin | Bin 512 -> 0 bytes data/tilesets/haiteku_collision.inc | 128 +++++++++ data/tilesets/house_collision.bin | Bin 256 -> 0 bytes data/tilesets/house_collision.inc | 64 +++++ data/tilesets/kanto_collision.bin | Bin 512 -> 0 bytes data/tilesets/kanto_collision.inc | 129 +++++++++ data/tilesets/lab_collision.bin | Bin 256 -> 0 bytes data/tilesets/lab_collision.inc | 64 +++++ data/tilesets/mart_collision.bin | Bin 256 -> 0 bytes data/tilesets/mart_collision.inc | 64 +++++ data/tilesets/office_collision.bin | Bin 512 -> 0 bytes data/tilesets/office_collision.inc | 128 +++++++++ data/tilesets/old_city_collision.bin | Bin 512 -> 0 bytes data/tilesets/old_city_collision.inc | 256 +++++++++--------- data/tilesets/pokecenter_collision.bin | Bin 256 -> 0 bytes data/tilesets/pokecenter_collision.inc | 64 +++++ data/tilesets/power_plant_collision.bin | Bin 512 -> 0 bytes data/tilesets/power_plant_collision.inc | 128 +++++++++ data/tilesets/radio_tower_collision.bin | Bin 256 -> 0 bytes data/tilesets/radio_tower_collision.inc | 64 +++++ data/tilesets/rocket_house_collision.bin | Bin 256 -> 0 bytes data/tilesets/rocket_house_collision.inc | 64 +++++ data/tilesets/ruins_of_alph_collision.bin | Bin 512 -> 0 bytes data/tilesets/ruins_of_alph_collision.inc | 128 +++++++++ data/tilesets/ship_collision.bin | Bin 512 -> 0 bytes data/tilesets/ship_collision.inc | 128 +++++++++ data/tilesets/ship_port_collision.bin | Bin 512 -> 0 bytes data/tilesets/ship_port_collision.inc | 128 +++++++++ data/tilesets/silent_hill_collision.bin | Bin 512 -> 0 bytes data/tilesets/silent_hill_collision.inc | 20 +- data/tilesets/south_collision.bin | Bin 512 -> 0 bytes data/tilesets/south_collision.inc | 128 +++++++++ data/tilesets/tower_collision.bin | Bin 256 -> 0 bytes data/tilesets/tower_collision.inc | 64 +++++ data/tilesets/traditional_house_collision.bin | Bin 256 -> 0 bytes data/tilesets/traditional_house_collision.inc | 65 +++++ data/tilesets/west_collision.bin | Bin 512 -> 0 bytes data/tilesets/west_collision.inc | 128 +++++++++ engine/debug/field/change_transportation.inc | 6 +- engine/events/field_moves.asm | 12 +- engine/overworld/map_objects.asm | 14 +- engine/overworld/object_collision.asm | 6 +- engine/overworld/player_movement.asm | 92 +++---- engine/overworld/player_object.asm | 4 +- engine/overworld/wildmons.asm | 18 +- gfx/gfx.asm | 50 ++-- home/map.asm | 14 +- 67 files changed, 2901 insertions(+), 389 deletions(-) delete mode 100644 data/tilesets/aquarium_collision.bin create mode 100644 data/tilesets/aquarium_collision.inc delete mode 100644 data/tilesets/baadon_collision.bin create mode 100644 data/tilesets/baadon_collision.inc delete mode 100644 data/tilesets/bull_forest_collision.bin create mode 100644 data/tilesets/bull_forest_collision.inc delete mode 100644 data/tilesets/cave_collision.bin create mode 100644 data/tilesets/cave_collision.inc delete mode 100644 data/tilesets/dept_store_collision.bin create mode 100644 data/tilesets/dept_store_collision.inc delete mode 100644 data/tilesets/fonto_collision.bin create mode 100644 data/tilesets/fonto_collision.inc delete mode 100644 data/tilesets/forest_collision.bin delete mode 100644 data/tilesets/gate_collision.bin create mode 100644 data/tilesets/gate_collision.inc delete mode 100644 data/tilesets/gym_collision.bin create mode 100644 data/tilesets/gym_collision.inc delete mode 100644 data/tilesets/haiteku_collision.bin create mode 100644 data/tilesets/haiteku_collision.inc delete mode 100644 data/tilesets/house_collision.bin create mode 100644 data/tilesets/house_collision.inc delete mode 100644 data/tilesets/kanto_collision.bin create mode 100644 data/tilesets/kanto_collision.inc delete mode 100644 data/tilesets/lab_collision.bin create mode 100644 data/tilesets/lab_collision.inc delete mode 100644 data/tilesets/mart_collision.bin create mode 100644 data/tilesets/mart_collision.inc delete mode 100644 data/tilesets/office_collision.bin create mode 100644 data/tilesets/office_collision.inc delete mode 100644 data/tilesets/old_city_collision.bin delete mode 100644 data/tilesets/pokecenter_collision.bin create mode 100644 data/tilesets/pokecenter_collision.inc delete mode 100644 data/tilesets/power_plant_collision.bin create mode 100644 data/tilesets/power_plant_collision.inc delete mode 100644 data/tilesets/radio_tower_collision.bin create mode 100644 data/tilesets/radio_tower_collision.inc delete mode 100644 data/tilesets/rocket_house_collision.bin create mode 100644 data/tilesets/rocket_house_collision.inc delete mode 100644 data/tilesets/ruins_of_alph_collision.bin create mode 100644 data/tilesets/ruins_of_alph_collision.inc delete mode 100644 data/tilesets/ship_collision.bin create mode 100644 data/tilesets/ship_collision.inc delete mode 100644 data/tilesets/ship_port_collision.bin create mode 100644 data/tilesets/ship_port_collision.inc delete mode 100644 data/tilesets/silent_hill_collision.bin delete mode 100644 data/tilesets/south_collision.bin create mode 100644 data/tilesets/south_collision.inc delete mode 100644 data/tilesets/tower_collision.bin create mode 100644 data/tilesets/tower_collision.inc delete mode 100644 data/tilesets/traditional_house_collision.bin create mode 100644 data/tilesets/traditional_house_collision.inc delete mode 100644 data/tilesets/west_collision.bin create mode 100644 data/tilesets/west_collision.inc diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm index a1917da3..0fcf1798 100644 --- a/constants/collision_constants.asm +++ b/constants/collision_constants.asm @@ -17,13 +17,13 @@ ; 6 - Warps E - unused ; 7 - Special Talk Act F - unused ; New Types: -; 0 - Regular 8 - ??? +; 0 - Regular 8 - Minigame Talk Action ; 1 - Cuttable 9 - Special Talk Action ; 2 - Water A - Jump Action ; 3 - Water 2 B - unused ; 4 - Land C - unused ; 5 - Land 2 D - unused -; 6 - ??? E - unused +; 6 - Pits E - unused ; 7 - Warps F - unused MACRO tilecoll @@ -31,48 +31,66 @@ MACRO tilecoll db COLL_\1, COLL_\2, COLL_\3, COLL_\4 ENDM -DEF COLL_TYPE_MASK EQU $f0 -DEF COLL_SUBTYPE_MASK EQU $07 -DEF COLL_WATER_SUBTYPE_MASK EQU $03 - -DEF COLL_FLAG EQU $08 +DEF COLLMASK_TYPE EQU $f0 +DEF COLLMASK_SUBTYPE EQU $07 ; LO_NYBBLE_GRASS in final +DEF COLLMASK_WATER_SUBTYPE EQU $03 + +DEF COLLFLAG_ENCOUNTER EQU $08 ; enables encounters or special actions depending on the type. + +; old collision data type nybbles for "COLLMASK_TYPE" +DEF COLLMASK_TYPE_OLD_WATER EQU $20 ; matches COLLMASK_TYPE_WATER +DEF COLLMASK_TYPE_OLD_WATER_ALT EQU $40 +DEF COLLMASK_TYPE_OLD_PITS EQU $50 +DEF COLLMASK_TYPE_OLD_WARPS EQU $60 +DEF COLLMASK_TYPE_OLD_SPECIAL EQU $70 +DEF COLLMASK_TYPE_OLD_TALL_GRASS EQU $80 + +; collision data type nybbles for "COLLMASK_TYPE" +DEF COLLMASK_TYPE_TALL_GRASS EQU $10 +DEF COLLMASK_TYPE_WATER EQU $20 +DEF COLLMASK_TYPE_WATER_ALT EQU $30 ; HI_NYBBLE_CURRENT in final +DEF COLLMASK_TYPE_WALK EQU $40 +DEF COLLMASK_TYPE_WALK_ALT EQU $50 +DEF COLLMASK_TYPE_PITS EQU $60 +DEF COLLMASK_TYPE_WARPS EQU $70 +DEF COLLMASK_TYPE_MINIGAME EQU $80 +DEF COLLMASK_TYPE_SPECIAL EQU $90 +DEF COLLTYPE_LEDGES EQU $a0 ; old collision constants -DEF OLD_HI_NYBBLE_WATER EQU $20 -DEF OLD_HI_NYBBLE_WATER_ALT EQU $40 -DEF OLD_HI_NYBBLE_PITS EQU $50 -DEF OLD_HI_NYBBLE_WARPS EQU $60 -DEF OLD_HI_NYBBLE_SPECIAL EQU $70 -DEF OLD_HI_NYBBLE_TALL_GRASS EQU $80 - -DEF COLL_OLD_SOLID EQU $01 -DEF COLL_OLD_FLOOR EQU $03 -DEF COLL_OLD_WALL EQU $04 +DEF COLL_OLD_FLOOR EQU $00 ; matches COLL_FLOOR +DEF COLL_OLD_WALL EQU $01 +DEF COLL_OLD_FLOOR_INSIDE EQU $03 +DEF COLL_OLD_WALL_INSIDE EQU $04 ; $10 (old) DEF COLL_OLD_LEDGE EQU $11 +DEF COLL_OLD_STEPS EQU $13 ; water collisions (old) -DEF COLL_OLD_WATER EQU $24 +DEF COLL_OLD_WATER EQU $21 ; matches COLL_WATER +DEF COLL_OLD_WATER_ENCOUNTER EQU $24 -; water collisions 2 (old) -DEF COLL_OLD_WATERFALL EQU $40 -DEF COLL_OLD_HOTSPRING EQU $41 -DEF COLL_OLD_42 EQU $42 -DEF COLL_OLD_43 EQU $43 -DEF COLL_OLD_WHIRLPOOL EQU $44 +; water collisions (hm) (old) +DEF COLL_OLD_WATERFALL EQU $40 ; HM07 +DEF COLL_OLD_MUDPIT EQU $41 ; NEWTYPE +DEF COLL_OLD_42 EQU $42 ; ??? +DEF COLL_OLD_43 EQU $43 ; ??? +DEF COLL_OLD_WHIRLPOOL EQU $44 ; HM06 ; falling warp collisions (old) -DEF COLL_OLD_PIT EQU $50 -DEF COLL_OLD_ROCK EQU $51 +DEF COLL_OLD_PIT EQU $50 +DEF COLL_OLD_PIT_SKATE EQU $51 +DEF COLL_OLD_PIT_CAVE EQU $57 ; warp collisions (old) DEF COLL_OLD_CARPET EQU $60 DEF COLL_OLD_DOOR EQU $61 +DEF COLL_OLD_LADDER EQU $62 ; special collisions (old) -DEF COLL_OLD_TOWN_MAP EQU $70 +DEF COLL_OLD_SIGNPOST EQU $70 DEF COLL_OLD_SHOP_SIGN EQU $71 DEF COLL_OLD_MART_ITEM EQU $72 DEF COLL_OLD_COUNTER EQU $73 @@ -81,14 +99,12 @@ DEF COLL_OLD_COUNTER EQU $73 DEF COLL_OLD_CUT_TREE EQU $80 DEF COLL_OLD_GRASS_81 EQU $81 DEF COLL_OLD_GRASS_82 EQU $82 -DEF COLL_OLD_GRASS_83 EQU $83 - -DEF COLL_OLD_OOB EQU $FF ; first block in every tileset except TILESET_SILENT_HILL. +DEF COLL_OLD_GRASS EQU $83 ; new collision constants DEF COLL_FLOOR EQU $00 -DEF COLL_OOB EQU $05 ; first block in TILESET_SILENT_HILL. +DEF COLL_OOB EQU $05 ; first block in TILESET_SILENT_HILL and TILESET_ROCKET_HOUSE DEF COLL_WALL EQU $07 ; cuttable collisions @@ -125,20 +141,26 @@ DEF COLL_LAND2_S EQU $53 ; falling warp collisions DEF COLL_PIT EQU $60 +DEF COLL_PIT_VB EQU $61 ; Why is this a pit? ; warp collisions DEF COLL_CARPET EQU $70 DEF COLL_DOOR EQU $71 -DEF COLL_STEPS EQU $72 +DEF COLL_LADDER EQU $72 DEF COLL_CAVE EQU $73 +DEF COLL_STAIRS EQU $75 + +; minigame collisions +DEF COLL_SLOTS EQU $80 +DEF COLL_CONSOLE EQU $83 ; special collisions DEF COLL_COUNTER EQU $90 DEF COLL_BOOKCASE EQU $91 -DEF COLL_92 EQU $92 +DEF COLL_VENDING_MACHINE EQU $92 DEF COLL_PC EQU $93 DEF COLL_RADIO EQU $94 -DEF COLL_TOWN_MAP EQU $95 +DEF COLL_SIGNPOST EQU $95 DEF COLL_STRAIGHT_SIGNPOST EQU $97 ; jump collisions @@ -153,18 +175,9 @@ DEF COLL_JUMP_SW EQU $a5 DEF COLL_JUMP_NE EQU $a6 DEF COLL_JUMP_NW EQU $a7 +DEF COLL_FF EQU $ff + DEF NEVER_SOLID EQU 0 DEF SOMETIMES_SOLID EQU 1 DEF ALWAYS_SOLID EQU 15 -; collision data type nybbles -DEF LO_NYBBLE_GRASS EQU $07 -DEF HI_NYBBLE_TALL_GRASS EQU $10 -DEF HI_NYBBLE_WATER EQU $20 -DEF HI_NYBBLE_WATER_ALT EQU $30 ; HI_NYBBLE_CURRENT in final -DEF HI_NYBBLE_WALK EQU $40 -DEF HI_NYBBLE_WALK_ALT EQU $50 -DEF HI_NYBBLE_PITS EQU $60 -DEF HI_NYBBLE_WARPS EQU $70 -DEF HI_NYBBLE_SPECIAL EQU $90 -DEF HI_NYBBLE_LEDGES EQU $a0 diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm index 2e4455e4..7ebca6c5 100644 --- a/constants/map_object_constants.asm +++ b/constants/map_object_constants.asm @@ -52,9 +52,9 @@ DEF OW_RIGHT EQU RIGHT << 2 shift_const WONT_DELETE ; 1 shift_const FIXED_FACING ; 2 shift_const SLIDING ; 3 - shift_const COLL_TILES ; 4 + shift_const NOCLIP_TILES ; 4 shift_const NOCLIP_NOT_SET ; 5 - shift_const COLL_OBJS ; 6 + shift_const NOCLIP_OBJS ; 6 shift_const CENTERED_OBJECT ; 7 ; object_struct OBJECT_FLAGS2 bit flags diff --git a/data/tilesets/aquarium_collision.bin b/data/tilesets/aquarium_collision.bin deleted file mode 100644 index 92606fdc9c1346a3f2268122b33612d044be4499..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmcJJ!4Uu<2m|@it{?xDKnIkH8*V7!;tY`xBi-HZHi)RoG)sDit6(n7DI7aT6hJ*F k6<~TN@8Xk{e39;$$4=&gezKH_zw|8Hg`T8m~&1OT)3S~d6<#k$iPg+vI=Yr7KhA7wz7?sttmDHdU*XMD8Q%D z4x3Fc=?ckbx#m|I?6V!9G0uK==|al)r|SCu-O`x@*=2U&=N$GIlwX`w$+;=@<^AZK L{A0$W{3E^r!e1HQ diff --git a/data/tilesets/baadon_collision.inc b/data/tilesets/baadon_collision.inc new file mode 100644 index 00000000..0b4d0913 --- /dev/null +++ b/data/tilesets/baadon_collision.inc @@ -0,0 +1,128 @@ + tilecoll FF, FF, FF, FF, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_DOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_DOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_SIGNPOST, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_CUT_TREE, + tilecoll OLD_CUT_TREE, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_CUT_TREE, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_CUT_TREE, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_LEDGE, OLD_LEDGE, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_LEDGE, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_GRASS | COLLFLAG_ENCOUNTER, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_CUT_TREE, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WATER, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, OLD_FLOOR, OLD_FLOOR, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_SIGNPOST, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_SIGNPOST, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_SIGNPOST, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, diff --git a/data/tilesets/bull_forest_collision.bin b/data/tilesets/bull_forest_collision.bin deleted file mode 100644 index e29aa63326df6ebe3d5ecf0bd1dd965adae8cc33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmaiwxfO&k3`C_8D1qE%(8OlA14?kdMSJH<=$W?(!=Y<5l0D~~Cb)1pp8Rfxf8o1# zYK5p1h~wf^9$UTtd69eZ_7@wj%U5KgScl-(!$3~Z-RL7Z(8tm RFG5bIpEzfbf5GFZ?mvK5(XIQ7Q7C&FH(pc3IG5A diff --git a/data/tilesets/cave_collision.inc b/data/tilesets/cave_collision.inc new file mode 100644 index 00000000..2d167f93 --- /dev/null +++ b/data/tilesets/cave_collision.inc @@ -0,0 +1,128 @@ + tilecoll FF, FF, FF, FF, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_LEDGE, OLD_LEDGE, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, + tilecoll OLD_FLOOR, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, OLD_FLOOR, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, + tilecoll OLD_WALL, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, OLD_FLOOR, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, + tilecoll OLD_FLOOR, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, OLD_FLOOR, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, + tilecoll OLD_WALL, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, OLD_FLOOR, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, OLD_WALL, OLD_FLOOR, + tilecoll OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_LADDER, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_LADDER, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_LADDER, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_LADDER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WATER, OLD_WALL, + tilecoll OLD_WATER, OLD_WALL, OLD_WATER, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WATER, OLD_WALL, + tilecoll OLD_WATER, OLD_WALL, OLD_WATER, OLD_WALL, + tilecoll OLD_WATER, OLD_WALL, OLD_WATER, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_LADDER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WATER, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WATER, OLD_WATER, + tilecoll OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_GRASS | COLLFLAG_ENCOUNTER, + tilecoll OLD_WALL, OLD_WALL, OLD_LADDER, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_LADDER, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_LADDER, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_LADDER, OLD_FLOOR, + tilecoll OLD_LADDER, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_PIT_CAVE, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_PIT_CAVE, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_PIT_CAVE, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_PIT_CAVE, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_LADDER, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_LADDER, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_LADDER, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_LADDER, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_PIT_CAVE, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_LADDER, OLD_PIT_CAVE, OLD_FLOOR, + tilecoll OLD_WALL, OLD_PIT_CAVE, OLD_PIT_CAVE, OLD_WALL, + tilecoll OLD_WALL, OLD_WATER, OLD_WALL, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_LADDER, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_LADDER, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_LADDER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_LADDER, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, diff --git a/data/tilesets/dept_store_collision.bin b/data/tilesets/dept_store_collision.bin deleted file mode 100644 index f78ed750581bcdb77279f299698092b25d5de3c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmcIeK@Pwm4B}wIciq)jG+z4L4yxG?Mzx4Z3sqH%KrVn{!Ej=(mKVK;CD?k&#C*A_W{nFCTt8t|NRP7|7NH!9U`MtxJa=4fxY zPSLV&Y0u^av^{ zHNsfB1~ZJJj!(4qrIISB;kvY_=z^*Td%wT`5mi*X=b2X?iItu4iayg)%9&2uF*|=w LB&PmEUQo6_v3eOt diff --git a/data/tilesets/fonto_collision.inc b/data/tilesets/fonto_collision.inc new file mode 100644 index 00000000..4a37e4cb --- /dev/null +++ b/data/tilesets/fonto_collision.inc @@ -0,0 +1,129 @@ + tilecoll FF, FF, FF, FF, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_DOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_DOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_SIGNPOST, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_CUT_TREE, + tilecoll OLD_CUT_TREE, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_CUT_TREE, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_CUT_TREE, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_LEDGE, OLD_LEDGE, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_LEDGE, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_GRASS_82, OLD_GRASS_82, OLD_GRASS_82, OLD_GRASS_82, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WATER, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WATER, OLD_WALL, OLD_WATER, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WALL, OLD_WATER, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WATER, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_CARPET, OLD_CARPET, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WATERFALL | COLLFLAG_ENCOUNTER, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATERFALL | COLLFLAG_ENCOUNTER, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_SIGNPOST, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + diff --git a/data/tilesets/forest_collision.bin b/data/tilesets/forest_collision.bin deleted file mode 100644 index 241609371025c7f991d64462afbbde39ff5be462..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmdr|u?@g52y-XD&@~_Snchon8Y0H3V=NFh2Bah+0xyVr5)uk06Ob^ZPocZ+3Tr-x kJeW-{cGo=bRF`8SFUT(awO$8M>7C-PJL~$N{@y?Q0qhepk^lez diff --git a/data/tilesets/forest_collision.inc b/data/tilesets/forest_collision.inc index 3dd5a522..7dc47bcb 100644 --- a/data/tilesets/forest_collision.inc +++ b/data/tilesets/forest_collision.inc @@ -1,7 +1,7 @@ - tilecoll OLD_OOB, OLD_OOB, OLD_OOB, OLD_OOB, + tilecoll FF, FF, FF, FF, tilecoll FLOOR, FLOOR, FLOOR, FLOOR, tilecoll FLOOR, FLOOR, FLOOR, WALL, - tilecoll FLOOR, TOWN_MAP, FLOOR, FLOOR, + tilecoll FLOOR, SIGNPOST, FLOOR, FLOOR, tilecoll FLOOR, FLOOR, FLOOR, FLOOR, tilecoll WALL, WALL, WALL, FLOOR, tilecoll WALL, WALL, FLOOR, FLOOR, @@ -10,7 +10,7 @@ tilecoll WALL, FLOOR, WALL, FLOOR, tilecoll FLOOR, FLOOR, FLOOR, FLOOR, tilecoll FLOOR, WALL, FLOOR, WALL, - tilecoll GRASS | COLL_FLAG, GRASS | COLL_FLAG, GRASS | COLL_FLAG, GRASS | COLL_FLAG, + tilecoll GRASS | COLLFLAG_ENCOUNTER, GRASS | COLLFLAG_ENCOUNTER, GRASS | COLLFLAG_ENCOUNTER, GRASS | COLLFLAG_ENCOUNTER, tilecoll WALL, FLOOR, WALL, WALL, tilecoll FLOOR, FLOOR, WALL, WALL, tilecoll FLOOR, WALL, WALL, WALL, @@ -29,100 +29,100 @@ tilecoll WALL, FLOOR, FLOOR, FLOOR, tilecoll FLOOR, WALL, FLOOR, FLOOR, tilecoll WALL, WALL, WALL, FLOOR, - tilecoll WALL, WALL, FLOOR, WALL, ; garbage data past this point + tilecoll WALL, WALL, FLOOR, WALL, ; previous writes past this point tilecoll WATER, WATER, WATER, WATER, tilecoll WATER, WATER, WATER, WATER, tilecoll WALL, FLOOR, WALL, WALL, tilecoll FLOOR, WALL, WALL, WALL, - tilecoll WATER, WATER, WATER, WATER, - tilecoll WATER, WATER, WATER, WATER, - tilecoll WATER, WATER, WATER, WATER, - tilecoll WATER, WATER, WATER, WATER, - tilecoll WATER, WATER, WATER, WATER, - tilecoll WATER, WATER, WATER, WATER, - tilecoll WATER, WATER, WATER, WATER, - tilecoll WATER, WATER, WATER, WATER, - tilecoll WATER, WATER, WATER, WATER, - tilecoll WATER, WATER, WATER, WATER, - tilecoll WATER, WATER, WATER, WATER, - tilecoll WATER, WATER, WATER, WATER, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll WATER, WATER, WATER, WATER, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll WATER, WATER, WATER, WATER, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll WATER, WATER, WATER, WATER, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll WATER, WATER, WATER, WATER, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll WATER, WATER, WATER, WATER, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll WATER, WATER, WATER, WATER, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll WATER, WATER, WATER, WATER, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll WATER, WATER, WATER, WATER, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll WATER, WATER, WATER, WATER, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll WATER, WATER, WATER, WATER, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll WATER, WATER, WATER, WATER, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll WATER, WATER, WATER, WATER, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll WATER, WATER, WATER, WATER, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll WATER, WATER, WATER, WATER, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll WATER, WATER, WATER, WATER, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll WATER, WATER, WATER, WATER, - tilecoll WATER, WATER, WATER, WATER, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, - tilecoll CARPET, OLD_SOLID, FLOOR, FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, diff --git a/data/tilesets/gate_collision.bin b/data/tilesets/gate_collision.bin deleted file mode 100644 index c35b44a411787b3a9113b6df027f9a01a535ba46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmcgmfeFAc3>xU6Z7(R~f2_$mx(h0VXhex5!64u19f*y*m|7!%*2*arVJ9&ttIzr80v0Bp8kYb7 diff --git a/data/tilesets/gate_collision.inc b/data/tilesets/gate_collision.inc new file mode 100644 index 00000000..9283e733 --- /dev/null +++ b/data/tilesets/gate_collision.inc @@ -0,0 +1,64 @@ + tilecoll FF, FF, FF, FF, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_DOOR, OLD_DOOR, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_COUNTER, OLD_COUNTER, OLD_COUNTER, OLD_COUNTER, + tilecoll OLD_COUNTER, OLD_COUNTER, OLD_COUNTER, OLD_COUNTER, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_COUNTER, OLD_COUNTER, OLD_COUNTER, OLD_FLOOR_INSIDE, + tilecoll OLD_COUNTER, OLD_COUNTER, OLD_FLOOR_INSIDE, OLD_COUNTER, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_CARPET, OLD_CARPET, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_COUNTER, OLD_COUNTER, + tilecoll OLD_COUNTER, OLD_FLOOR_INSIDE, OLD_COUNTER, OLD_COUNTER, + tilecoll OLD_FLOOR_INSIDE, OLD_COUNTER, OLD_COUNTER, OLD_COUNTER, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_COUNTER, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_COUNTER, + tilecoll OLD_COUNTER, OLD_COUNTER, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_LADDER, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_LADDER, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_LADDER, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_DOOR, OLD_DOOR, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_SIGNPOST, OLD_SIGNPOST, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_SIGNPOST, OLD_SIGNPOST, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll FF, FF, FF, FF, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_LADDER, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, diff --git a/data/tilesets/gym_collision.bin b/data/tilesets/gym_collision.bin deleted file mode 100644 index 82309c47cfdd3ffd79abd9e2b443e1686bf927c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmZvXK@Pwm2n4q!_*Mxzsztabo6mv3j1-mrN8p|(5dk>zQw!_ZA2`=0Y6Av@^4R;S> z8F*-N@DeMKGkHY$p1S=3<*&ZR2~gP+!u_ Qt5)^8ClA>~*(HCQFPz>Xod5s; diff --git a/data/tilesets/haiteku_collision.inc b/data/tilesets/haiteku_collision.inc new file mode 100644 index 00000000..9c706e49 --- /dev/null +++ b/data/tilesets/haiteku_collision.inc @@ -0,0 +1,128 @@ + tilecoll FF, FF, FF, FF, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_DOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_DOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_SIGNPOST, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_CUT_TREE, + tilecoll OLD_CUT_TREE, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_CUT_TREE, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_CUT_TREE, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_LEDGE, OLD_LEDGE, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_GRASS_82, OLD_GRASS_82, OLD_GRASS_82, OLD_GRASS_82, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WATER, OLD_WALL, + tilecoll OLD_WALL, OLD_WATER, OLD_WALL, OLD_WATER, + tilecoll OLD_WALL, OLD_WATER, OLD_WALL, OLD_WATER, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WALL, OLD_WATER, OLD_WALL, + tilecoll OLD_WATER, OLD_WALL, OLD_WATER, OLD_WALL, + tilecoll OLD_WALL, OLD_WATER, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_CARPET, OLD_CARPET, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_WALL, + tilecoll OLD_WATER, OLD_WALL, OLD_WATER, OLD_WALL, + tilecoll OLD_FLOOR, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WATER, OLD_WALL, OLD_WATER, + tilecoll OLD_WATER, OLD_WALL, OLD_WATER, OLD_WALL, + tilecoll OLD_WALL, OLD_WATER, OLD_WALL, OLD_WATER, + tilecoll OLD_WATER, OLD_WHIRLPOOL, OLD_WHIRLPOOL, OLD_WATER, + tilecoll OLD_WATERFALL | COLLFLAG_ENCOUNTER, OLD_WATERFALL | COLLFLAG_ENCOUNTER, OLD_WATERFALL | COLLFLAG_ENCOUNTER, OLD_WATERFALL | COLLFLAG_ENCOUNTER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_DOOR, OLD_WALL, OLD_DOOR, OLD_WALL, + tilecoll OLD_DOOR, OLD_WALL, OLD_DOOR, OLD_WALL, + tilecoll OLD_WATER, OLD_WALL, OLD_WATER, OLD_WALL, + tilecoll OLD_WALL, OLD_WATER, OLD_WALL, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_SIGNPOST, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, diff --git a/data/tilesets/house_collision.bin b/data/tilesets/house_collision.bin deleted file mode 100644 index fd9884cd3bda79b852f1533446b9f123ffb0a922..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmcIcK?=Yy2oo&iyM^9%?F&i^9`{t2wCu14ETTpe&CI-E23Q!uG0BNqfzVE>;bLW; pNjfP4z*OJ2{1CG8{sgzcn#a4y$B-a|bt}c)%Qsqce{&muE)T5?7(@U7 diff --git a/data/tilesets/house_collision.inc b/data/tilesets/house_collision.inc new file mode 100644 index 00000000..7e12ffe1 --- /dev/null +++ b/data/tilesets/house_collision.inc @@ -0,0 +1,64 @@ + tilecoll FF, FF, FF, FF, + tilecoll STRAIGHT_SIGNPOST | COLLFLAG_ENCOUNTER, WALL, FLOOR, FLOOR, + tilecoll WALL, WALL, FLOOR, STRAIGHT_SIGNPOST, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FF, FF, FF, FF, + tilecoll WALL, WALL, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, CARPET, CARPET, + tilecoll WALL, WALL, STRAIGHT_SIGNPOST, STRAIGHT_SIGNPOST, + tilecoll FLOOR, FLOOR, FLOOR, WALL, + tilecoll FLOOR, FLOOR, WALL, FLOOR, + tilecoll WALL, LADDER | COLLFLAG_ENCOUNTER, FLOOR, FLOOR, + tilecoll WALL, LADDER | COLLFLAG_ENCOUNTER, FLOOR, FLOOR, + tilecoll FLOOR, WALL, FLOOR, FLOOR, + tilecoll WALL, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll WALL, WALL, STRAIGHT_SIGNPOST, WALL, + tilecoll WALL, WALL, PC, FLOOR, + tilecoll WALL, WALL, STRAIGHT_SIGNPOST, STRAIGHT_SIGNPOST, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, STRAIGHT_SIGNPOST, FLOOR, STRAIGHT_SIGNPOST, + tilecoll FLOOR, WALL, FLOOR, WALL, + tilecoll WALL, WALL, FLOOR, WALL, + tilecoll FLOOR, WALL, FLOOR, WALL, + tilecoll FLOOR, STRAIGHT_SIGNPOST, FLOOR, FLOOR, + tilecoll WALL, WALL, RADIO, PC, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll WALL, WALL, RADIO, FLOOR, + tilecoll WALL, WALL, BOOKCASE, BOOKCASE, + tilecoll WALL, FLOOR, WALL, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll STRAIGHT_SIGNPOST, FLOOR, CONSOLE, FLOOR, ;previous writes past this point? + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_COUNTER, OLD_COUNTER, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_COUNTER, OLD_COUNTER, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_COUNTER, OLD_COUNTER, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, diff --git a/data/tilesets/kanto_collision.bin b/data/tilesets/kanto_collision.bin deleted file mode 100644 index b6e716a8128f267857bb1ff1393073b81b557d7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmb7=%MHUY3`3<6JVLhV3b{oacm&_ObROj&d@4!=F(s0+60;5m)dvqV@k&WMq@4)5 z(o$cN(yKT~5a{mf2W0C`(*~->QkMH|RTBkkP0fa_WmJAbrEnG*=DaV^yiAFtajNQ` zNIhG9e`x5Qv5{m7_vhgSxd3co*Yo>L_Jt9T-iRD~oAGQcGgl8ls(--F^PfELK>H6b D!TcBk diff --git a/data/tilesets/kanto_collision.inc b/data/tilesets/kanto_collision.inc new file mode 100644 index 00000000..04fe6919 --- /dev/null +++ b/data/tilesets/kanto_collision.inc @@ -0,0 +1,129 @@ + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_DOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_DOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_SIGNPOST, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_CUT_TREE, + tilecoll OLD_CUT_TREE, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_CUT_TREE, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_CUT_TREE, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_LEDGE, OLD_LEDGE, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_LEDGE, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_GRASS | COLLFLAG_ENCOUNTER, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_CUT_TREE, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_CARPET, OLD_CARPET, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, OLD_FLOOR, OLD_FLOOR, OLD_PIT_SKATE | COLLFLAG_ENCOUNTER, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_SIGNPOST, OLD_WALL, + tilecoll OLD_WATERFALL | COLLFLAG_ENCOUNTER, OLD_WATERFALL | COLLFLAG_ENCOUNTER, OLD_WATERFALL | COLLFLAG_ENCOUNTER, OLD_WATERFALL | COLLFLAG_ENCOUNTER, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_SIGNPOST, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + diff --git a/data/tilesets/lab_collision.bin b/data/tilesets/lab_collision.bin deleted file mode 100644 index c22ce4084f4106565dbe2a2765215deea095e00f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmcJHK@xy42m^C)Cf}{s{-Wc7=i)}~6NEw`BjFlY{`hM#(q5M>`t82~qPZJM diff --git a/data/tilesets/lab_collision.inc b/data/tilesets/lab_collision.inc new file mode 100644 index 00000000..2164e222 --- /dev/null +++ b/data/tilesets/lab_collision.inc @@ -0,0 +1,64 @@ + tilecoll FF, FF, FF, FF, + tilecoll WALL, WALL, FLOOR, FLOOR, + tilecoll DOOR, WALL, FLOOR, FLOOR, + tilecoll WALL, WALL, PC, WALL, + tilecoll WALL, WALL, FLOOR, FLOOR, + tilecoll STRAIGHT_SIGNPOST, WALL, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll WALL, WALL, BOOKCASE, BOOKCASE, + tilecoll WALL, WALL, WALL, WALL, + tilecoll FLOOR, FLOOR, FLOOR, CARPET, + tilecoll FLOOR, FLOOR, CARPET, FLOOR, + tilecoll FF, FF, FF, FF, + tilecoll WALL, STRAIGHT_SIGNPOST, FLOOR, FLOOR, + tilecoll WALL, LADDER | COLLFLAG_ENCOUNTER, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, OLD_WALL_INSIDE, FLOOR, FLOOR, + tilecoll LADDER | COLLFLAG_ENCOUNTER, WALL, FLOOR, WALL, + tilecoll LADDER | COLLFLAG_ENCOUNTER, LADDER | COLLFLAG_ENCOUNTER, FLOOR, FLOOR, + tilecoll WALL, WALL, STRAIGHT_SIGNPOST, WALL, + tilecoll WALL, WALL, WALL, STRAIGHT_SIGNPOST, + tilecoll FLOOR, FLOOR, STRAIGHT_SIGNPOST, WALL, + tilecoll FLOOR, FLOOR, WALL, WALL, + tilecoll FLOOR, WALL, FLOOR, WALL, + tilecoll WALL, WALL, FLOOR, WALL, + tilecoll DOOR, WALL, FLOOR, WALL, + tilecoll WALL, WALL, STRAIGHT_SIGNPOST, STRAIGHT_SIGNPOST, + tilecoll LADDER | COLLFLAG_ENCOUNTER, WALL, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, CARPET, CARPET, + tilecoll LADDER | COLLFLAG_ENCOUNTER, WALL, FLOOR, FLOOR, + tilecoll LADDER | COLLFLAG_ENCOUNTER, WALL, FLOOR, WALL, + tilecoll LADDER | COLLFLAG_ENCOUNTER, LADDER | COLLFLAG_ENCOUNTER, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll WALL, WALL, WALL, WALL, + tilecoll FLOOR, FLOOR, WALL, WALL, + tilecoll FF, FF, FF, FF, + tilecoll WALL, FLOOR, BOOKCASE, FLOOR, + tilecoll FLOOR, WALL, FLOOR, BOOKCASE, + tilecoll FLOOR, WALL, FLOOR, FLOOR, + tilecoll WALL, WALL, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, diff --git a/data/tilesets/mart_collision.bin b/data/tilesets/mart_collision.bin deleted file mode 100644 index 9bc75fbc0c70ab93e98802166ee80cc52c4b6027..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmcIe2@b#@3?hMtI-k(}KN(8rUNBM{IV1u=6{!*f?TdJuO55`m>#(R}tibD+eRf3} a^4j%~1!?+tAbKnXEA_Ff$?QKk{xcrY1`PH9 diff --git a/data/tilesets/mart_collision.inc b/data/tilesets/mart_collision.inc new file mode 100644 index 00000000..44af5d29 --- /dev/null +++ b/data/tilesets/mart_collision.inc @@ -0,0 +1,64 @@ + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_MART_ITEM, OLD_MART_ITEM, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_MART_ITEM, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_COUNTER, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_MART_ITEM, OLD_MART_ITEM, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_MART_ITEM, OLD_MART_ITEM, + tilecoll OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_MART_ITEM, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_MART_ITEM, OLD_MART_ITEM, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_MART_ITEM, OLD_MART_ITEM, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_CARPET, OLD_CARPET, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_MART_ITEM, OLD_MART_ITEM, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_MART_ITEM, OLD_MART_ITEM, + tilecoll OLD_MART_ITEM, OLD_FLOOR_INSIDE, OLD_MART_ITEM, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_MART_ITEM, OLD_MART_ITEM, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_LADDER, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_FLOOR, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_DOOR, OLD_WALL_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_LADDER, OLD_WALL_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, diff --git a/data/tilesets/office_collision.bin b/data/tilesets/office_collision.bin deleted file mode 100644 index 9af51494a486e01c8ae58559c125b815277242e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmdUq0S>?*2m|4#W-l=Nf5J*zoqNK}!~%zPRaJSenK_0Ek+B6eLN64t`=oZ!tXfUE zAdZ6^UL0>}%=b{n9PpQG$L_t^sW|9azNz)O)Qd}|%;aTg&B{U9Bn;rjhi%4h=;r<{ LKp#yX62A%$QgI2d diff --git a/data/tilesets/office_collision.inc b/data/tilesets/office_collision.inc new file mode 100644 index 00000000..e0c1928e --- /dev/null +++ b/data/tilesets/office_collision.inc @@ -0,0 +1,128 @@ + tilecoll FF, FF, FF, FF, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_SIGNPOST, OLD_WALL, OLD_WALL, + tilecoll OLD_CARPET, OLD_CARPET, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_CARPET, OLD_WALL, OLD_WALL, + tilecoll OLD_CARPET, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_LADDER, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_SIGNPOST, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_MART_ITEM, + tilecoll OLD_WALL, OLD_WALL, OLD_MART_ITEM, OLD_MART_ITEM, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_LADDER, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, diff --git a/data/tilesets/old_city_collision.bin b/data/tilesets/old_city_collision.bin deleted file mode 100644 index cc7056e413ca81d7b890e768abaf0a3b5fc20925..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmaiv%NfHU41?_vGD7beD&Bw*xOZs!%Z9?KRX#wHAF;<6!+?Y4V(>5%Z{i@$$)$qh z(TG)CIfC+veebCw$}ztW;MpN>={o9T^lSO37M1fUqoQ&J>s@B&=RJcthS_yNE+wpr zH$b7)f)DJd60NJ_Z?J#l1S+?OrB-OgI=R=W0ofipgJ%$z+BMmFbikMdVxXHA?X OdE?;!Xzad94gUZJj~iS7 diff --git a/data/tilesets/old_city_collision.inc b/data/tilesets/old_city_collision.inc index 55e2142f..e289a567 100644 --- a/data/tilesets/old_city_collision.inc +++ b/data/tilesets/old_city_collision.inc @@ -1,128 +1,128 @@ - tilecoll OLD_OOB, OLD_OOB, OLD_OOB, OLD_OOB, - tilecoll FLOOR, FLOOR, FLOOR, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_TOWN_MAP, OLD_SOLID, FLOOR, FLOOR, - tilecoll FLOOR, FLOOR, FLOOR, FLOOR, - tilecoll OLD_SOLID, OLD_DOOR, FLOOR, FLOOR, - tilecoll OLD_TOWN_MAP, OLD_SOLID, FLOOR, FLOOR, - tilecoll OLD_TOWN_MAP, FLOOR, FLOOR, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll FLOOR, FLOOR, FLOOR, FLOOR, - tilecoll FLOOR, FLOOR, FLOOR, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, FLOOR, FLOOR, - tilecoll OLD_DOOR, OLD_SOLID, FLOOR, FLOOR, - tilecoll OLD_SOLID, OLD_DOOR, OLD_TOWN_MAP, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, FLOOR, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll FLOOR, FLOOR, FLOOR, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_DOOR, OLD_DOOR, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, FLOOR, OLD_SOLID, - tilecoll OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, - tilecoll OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, - tilecoll OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, FLOOR, - tilecoll OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, - tilecoll OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, - tilecoll OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, FLOOR, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, FLOOR, OLD_SOLID, - tilecoll FLOOR, FLOOR, OLD_TOWN_MAP, OLD_SOLID, - tilecoll OLD_SOLID, FLOOR, OLD_SOLID, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll FLOOR, OLD_SOLID, FLOOR, OLD_SOLID, - tilecoll OLD_TOWN_MAP, OLD_SOLID, FLOOR, FLOOR, - tilecoll OLD_SOLID, FLOOR, OLD_SOLID, OLD_SOLID, - tilecoll FLOOR, FLOOR, OLD_SOLID, OLD_SOLID, - tilecoll FLOOR, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, FLOOR, OLD_CUT_TREE, - tilecoll OLD_CUT_TREE, OLD_SOLID, FLOOR, OLD_SOLID, - tilecoll OLD_SOLID, OLD_CUT_TREE, FLOOR, FLOOR, - tilecoll FLOOR, OLD_CUT_TREE, FLOOR, OLD_SOLID, - tilecoll OLD_SOLID, FLOOR, FLOOR, FLOOR, - tilecoll FLOOR, FLOOR, FLOOR, OLD_SOLID, - tilecoll FLOOR, FLOOR, OLD_LEDGE, OLD_LEDGE, - tilecoll FLOOR, FLOOR, FLOOR, OLD_LEDGE, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, FLOOR, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, FLOOR, OLD_SOLID, - tilecoll OLD_GRASS_83 | COLL_FLAG, OLD_GRASS_83 | COLL_FLAG, OLD_GRASS_83 | COLL_FLAG, OLD_GRASS_83 | COLL_FLAG, - tilecoll OLD_SOLID, FLOOR, OLD_SOLID, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, FLOOR, - tilecoll FLOOR, OLD_SOLID, FLOOR, OLD_SOLID, - tilecoll FLOOR, FLOOR, FLOOR, FLOOR, - tilecoll OLD_SOLID, FLOOR, OLD_SOLID, OLD_SOLID, - tilecoll FLOOR, FLOOR, OLD_SOLID, OLD_SOLID, - tilecoll FLOOR, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll FLOOR, OLD_SOLID, FLOOR, OLD_CUT_TREE, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, FLOOR, FLOOR, - tilecoll OLD_DOOR, OLD_DOOR, FLOOR, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, FLOOR, FLOOR, - tilecoll FLOOR, FLOOR, FLOOR, FLOOR, - tilecoll OLD_CARPET, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_CARPET, OLD_CARPET, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_CARPET, OLD_SOLID, OLD_SOLID, - tilecoll OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, OLD_WATER | COLL_FLAG, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_DOOR, OLD_DOOR, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll WATER, WATER, WATER, WATER, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll WATER, WATER, WATER, WATER, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_DOOR, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_DOOR, OLD_SOLID, - tilecoll FLOOR, FLOOR, FLOOR, FLOOR, - tilecoll OLD_SOLID, FLOOR, OLD_SOLID, OLD_SOLID, - tilecoll FLOOR, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll FLOOR, FLOOR, FLOOR, FLOOR, - tilecoll FLOOR, FLOOR, FLOOR, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, OLD_DOOR, OLD_SOLID, - tilecoll FLOOR, FLOOR, FLOOR, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_CUT_TREE, FLOOR, FLOOR, - tilecoll OLD_CUT_TREE, OLD_SOLID, FLOOR, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_DOOR, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_DOOR, - tilecoll FLOOR, FLOOR, FLOOR, FLOOR, - tilecoll FLOOR, FLOOR, FLOOR, FLOOR, - tilecoll OLD_SOLID, OLD_SOLID, OLD_SOLID, OLD_SOLID, - tilecoll OLD_SOLID, OLD_SOLID, OLD_DOOR, OLD_SOLID, + tilecoll FF, FF, FF, FF, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_DOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_DOOR, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_DOOR, OLD_SIGNPOST, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, + tilecoll OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, + tilecoll OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, + tilecoll OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, + tilecoll OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_SIGNPOST, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_CUT_TREE, + tilecoll OLD_CUT_TREE, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_CUT_TREE, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_CUT_TREE, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_LEDGE, OLD_LEDGE, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_LEDGE, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_GRASS | COLLFLAG_ENCOUNTER, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_CUT_TREE, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_DOOR, OLD_DOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_CARPET, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_CARPET, OLD_CARPET, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_CARPET, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, OLD_WATER_ENCOUNTER | COLLFLAG_ENCOUNTER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_CUT_TREE, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_CUT_TREE, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_WALL, diff --git a/data/tilesets/pokecenter_collision.bin b/data/tilesets/pokecenter_collision.bin deleted file mode 100644 index a378b1a94a89bcba5e3d6975c6e6516a01036e5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmchQ!41GL3cib#P>NcM{i8(VuRbv6N_HwVmzpdhfq`4} zI&U^Omu`I@y@WRN;TL1t6 diff --git a/data/tilesets/power_plant_collision.inc b/data/tilesets/power_plant_collision.inc new file mode 100644 index 00000000..46b0b6f2 --- /dev/null +++ b/data/tilesets/power_plant_collision.inc @@ -0,0 +1,128 @@ + tilecoll FF, FF, FF, FF, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_CARPET, OLD_CARPET, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_LADDER, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_LADDER, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_LADDER, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_LADDER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, diff --git a/data/tilesets/radio_tower_collision.bin b/data/tilesets/radio_tower_collision.bin deleted file mode 100644 index ea516bdb5fece1c45f786e77dba237f8d504d574..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmchR-3h=j2!w?cZrwoNGKHZ7II8_L&=GoY>iKh+nQ1@)7gQ@Zb2z7?-9&$HDPo~( m4=^v$HS^~b9i?%P>syfpzQ>x>9(7m7VDE|&uk diff --git a/data/tilesets/radio_tower_collision.inc b/data/tilesets/radio_tower_collision.inc new file mode 100644 index 00000000..e12d3d0e --- /dev/null +++ b/data/tilesets/radio_tower_collision.inc @@ -0,0 +1,64 @@ + tilecoll FF, FF, FF, FF, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll WALL, STRAIGHT_SIGNPOST | COLLFLAG_ENCOUNTER, FLOOR, FLOOR, + tilecoll WALL, LADDER | COLLFLAG_ENCOUNTER, FLOOR, FLOOR, + tilecoll WALL, WALL, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, WALL, COUNTER, + tilecoll FLOOR, FLOOR, COUNTER, COUNTER, + tilecoll FLOOR, FLOOR, CARPET, CARPET, + tilecoll COUNTER, WALL, FLOOR, FLOOR, + tilecoll COUNTER, FLOOR, WALL, FLOOR, + tilecoll WALL, WALL, BOOKCASE, BOOKCASE, + tilecoll WALL, WALL, STRAIGHT_SIGNPOST | COLLFLAG_ENCOUNTER, STRAIGHT_SIGNPOST | COLLFLAG_ENCOUNTER, + tilecoll LADDER | COLLFLAG_ENCOUNTER, WALL, FLOOR, FLOOR, + tilecoll WALL, LADDER | COLLFLAG_ENCOUNTER, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, COUNTER, + tilecoll FLOOR, FLOOR, WALL, FLOOR, + tilecoll FLOOR, WALL, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll WALL, WALL, PC, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, WALL, WALL, + tilecoll OLD_FLOOR_INSIDE, OLD_COUNTER, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, ; leftover from previous write + tilecoll FLOOR, FLOOR, COUNTER, FLOOR, + tilecoll FLOOR, WALL, FLOOR, FLOOR, + tilecoll WALL, WALL, FLOOR, STRAIGHT_SIGNPOST | COLLFLAG_ENCOUNTER, + tilecoll WALL, WALL, FLOOR, WALL, + tilecoll WALL, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, WALL, WALL, + tilecoll LADDER | COLLFLAG_ENCOUNTER, WALL, FLOOR, FLOOR, + tilecoll WALL, WALL, FLOOR, FLOOR, + tilecoll FLOOR, COUNTER, FLOOR, WALL, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll BOOKCASE, BOOKCASE, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, WALL, WALL, + tilecoll FF, FF, FF, FF, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, diff --git a/data/tilesets/rocket_house_collision.bin b/data/tilesets/rocket_house_collision.bin deleted file mode 100644 index d1778d15675b6524806d352c9d3cd4781fe11970..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmchQ0Sdq{2m=M7$~1^$pt<8 diff --git a/data/tilesets/rocket_house_collision.inc b/data/tilesets/rocket_house_collision.inc new file mode 100644 index 00000000..103f5f60 --- /dev/null +++ b/data/tilesets/rocket_house_collision.inc @@ -0,0 +1,64 @@ + tilecoll OOB, OOB, OOB, OOB, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_SHOP_SIGN, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_CARPET, OLD_CARPET, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_MART_ITEM, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_LADDER, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_LADDER, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_MART_ITEM, OLD_MART_ITEM, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll FF, FF, FF, FF, + tilecoll OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_LADDER, OLD_WALL_INSIDE, OLD_FLOOR_INSIDE, OLD_FLOOR_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, OLD_WALL_INSIDE, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, diff --git a/data/tilesets/ruins_of_alph_collision.bin b/data/tilesets/ruins_of_alph_collision.bin deleted file mode 100644 index 0477566ca8355ce78f734e68d21288b6bb87bcf9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmezW|NnnRC}3b8rQzZ*wGasgBmmM2=0cT#DX192Tx3Z!HcTzp6tHP< z0?Ys!4mA^D>w<+5kpY1#Rz^gEU_f9%Ac%~JM2IUXr=$uA2LvW0rllt(3khdshlNW? Rb1}!oXJj&QBTO2ZEC4T(8RGx| diff --git a/data/tilesets/ruins_of_alph_collision.inc b/data/tilesets/ruins_of_alph_collision.inc new file mode 100644 index 00000000..891fc470 --- /dev/null +++ b/data/tilesets/ruins_of_alph_collision.inc @@ -0,0 +1,128 @@ + tilecoll FF, FF, FF, FF, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR,; Junk data past this point. + db 0xA0, 0xA1, 0x58, 0x59, + db 0x50, 0x51, 0xA8, 0xA9, + db 0x58, 0x59, 0x58, 0x59, + db 0x58, 0x59, 0x50, 0x51, + db 0x50, 0x51, 0x58, 0x59, + db 0x50, 0x51, 0x58, 0x59, + db 0xA0, 0xA1, 0x58, 0x59, + db 0x50, 0x51, 0xA8, 0xA9, + db 0x58, 0x59, 0x22, 0x23, + db 0x64, 0x65, 0x12, 0x13, + db 0x50, 0x51, 0x60, 0x61, + db 0x66, 0x67, 0x62, 0x63, + db 0x12, 0x13, 0x6A, 0x6B, + db 0x56, 0x57, 0x1A, 0x1B, + db 0x0A, 0x03, 0x5E, 0x5F, + db 0x68, 0x69, 0x02, 0x0B, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, diff --git a/data/tilesets/ship_collision.bin b/data/tilesets/ship_collision.bin deleted file mode 100644 index 00bad62e94e2395ccfdb9700be2f1eb44e3a1f76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmeH@-4Vbb2!rjW$^_m2h31ROF+{=RFAz90GoL0yLW(8it(zUJwbSGNs-29wBtk~m t!jCbhSYxw$iP)tMuWx*XwVH2%A((p=?P-(v9Irg1U}){|8NaC?_y9H02*v;a diff --git a/data/tilesets/ship_collision.inc b/data/tilesets/ship_collision.inc new file mode 100644 index 00000000..cecbe1ad --- /dev/null +++ b/data/tilesets/ship_collision.inc @@ -0,0 +1,128 @@ + tilecoll FF, FF, FF, FF, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_DOOR, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_LADDER, + tilecoll OLD_LADDER, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_LADDER, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_CARPET, OLD_CARPET, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_LADDER, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_LADDER, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_SIGNPOST, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_LADDER, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, diff --git a/data/tilesets/ship_port_collision.bin b/data/tilesets/ship_port_collision.bin deleted file mode 100644 index a886bd50b95902a715e10b6deee66d0c447ff300..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmezW|NnnRAYfo%WB`*O4iEr2SOEhNAW0M;v9U7kQZOJBPy`vHt3Z|mu~8wWET#w{ d9rTn(cO5z(H7w9&L3~t*O$D+Trg?bv0|0zLZ{7d^ diff --git a/data/tilesets/ship_port_collision.inc b/data/tilesets/ship_port_collision.inc new file mode 100644 index 00000000..2b98cbb7 --- /dev/null +++ b/data/tilesets/ship_port_collision.inc @@ -0,0 +1,128 @@ + tilecoll FF, FF, FF, FF, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_SIGNPOST, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, ; Junk data past this point + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $02, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $64, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, + db $3E, $02, $3E, $64, diff --git a/data/tilesets/silent_hill_collision.bin b/data/tilesets/silent_hill_collision.bin deleted file mode 100644 index 2856f831aa77b5fe2b1716200e69b23b1cf6ca79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcma)3u?@p84AWw0_ms8Wa!SAO3r2781%9+7D@P8{p+o>tqD0G1DWw?Tz;H6~Zbm-H z-8;2AP(qKRXRm8^FI>FKgZkqKPGFTW628U_nCT1#?v&~>w^~`OFs~Zb8gpWF#;Eo* zKLE5+mr;aJmtRKdO27MqcAgUsl=T3uLBUbHLr(8`-hbC)Jl?mYD7TJUL`T_N8CUcDqGT@;s_ggB}#B~ukl4Q+$Z_TVxA*Lq`{Tu<~{PM-;(@e+{dNo9~}A{d9|Yt+K~;8&nf!C8sf3 HQ`PeUxw04a diff --git a/data/tilesets/south_collision.inc b/data/tilesets/south_collision.inc new file mode 100644 index 00000000..6f3c9b68 --- /dev/null +++ b/data/tilesets/south_collision.inc @@ -0,0 +1,128 @@ + tilecoll FF, FF, FF, FF, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_SHOP_SIGN, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_DOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SHOP_SIGN, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SHOP_SIGN, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_DOOR, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_SHOP_SIGN, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_SHOP_SIGN, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_CUT_TREE, + tilecoll OLD_CUT_TREE, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_CUT_TREE, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_CUT_TREE, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_STEPS | COLLFLAG_ENCOUNTER, OLD_STEPS | COLLFLAG_ENCOUNTER, OLD_LEDGE, OLD_LEDGE, + tilecoll OLD_FLOOR, OLD_STEPS | COLLFLAG_ENCOUNTER, OLD_FLOOR, OLD_LEDGE, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_GRASS | COLLFLAG_ENCOUNTER, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_CUT_TREE, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_DOOR, OLD_WALL, OLD_DOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_CARPET, OLD_CARPET, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_DOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_DOOR, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_DOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, diff --git a/data/tilesets/tower_collision.bin b/data/tilesets/tower_collision.bin deleted file mode 100644 index 6b231664e951b04125dde3d35232de45b7ff21aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmc&t!3_X02;#@Oe!53HfumA5ldf<^DpFBNB7p`9T}Y72*k&8_M;ob*^=f9U*)Cfv VI|k=uFdR=CUq{Ow=g_bJ^|=Dq79Icq diff --git a/data/tilesets/tower_collision.inc b/data/tilesets/tower_collision.inc new file mode 100644 index 00000000..4d9568b3 --- /dev/null +++ b/data/tilesets/tower_collision.inc @@ -0,0 +1,64 @@ + tilecoll FF, FF, FF, FF, + tilecoll WALL, WALL, FLOOR, FLOOR, + tilecoll STRAIGHT_SIGNPOST | COLLFLAG_ENCOUNTER, FLOOR, FLOOR, CARPET, + tilecoll FLOOR, STRAIGHT_SIGNPOST | COLLFLAG_ENCOUNTER, CARPET, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll WALL, WALL, STAIRS, FLOOR, + tilecoll WALL, WALL, COUNTER, FLOOR, + tilecoll FLOOR, FLOOR, COUNTER, FLOOR, + tilecoll WALL, STRAIGHT_SIGNPOST | COLLFLAG_ENCOUNTER, FLOOR, FLOOR, + tilecoll STRAIGHT_SIGNPOST | COLLFLAG_ENCOUNTER, STRAIGHT_SIGNPOST | COLLFLAG_ENCOUNTER, FLOOR, FLOOR, + tilecoll WALL, STRAIGHT_SIGNPOST | COLLFLAG_ENCOUNTER, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, STAIRS, + tilecoll WALL, STRAIGHT_SIGNPOST | COLLFLAG_ENCOUNTER, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, STAIRS, + tilecoll WALL, WALL, STAIRS, FLOOR, + tilecoll WALL, STRAIGHT_SIGNPOST | COLLFLAG_ENCOUNTER, FLOOR, FLOOR, + tilecoll FF, FF, FF, FF, + tilecoll FLOOR, FLOOR, CARPET, CARPET, + tilecoll WALL, WALL, FLOOR, FLOOR, + tilecoll WALL, WALL, FLOOR, FLOOR, + tilecoll WALL, WALL, BOOKCASE, BOOKCASE, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll WALL, WALL, FLOOR, FLOOR, + tilecoll FLOOR, WALL, FLOOR, FLOOR, + tilecoll WALL, WALL, FLOOR, FLOOR, + tilecoll WALL, WALL, FLOOR, STAIRS, + tilecoll WALL, STRAIGHT_SIGNPOST | COLLFLAG_ENCOUNTER, FLOOR, FLOOR, + tilecoll STRAIGHT_SIGNPOST | COLLFLAG_ENCOUNTER, WALL, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, CARPET, + tilecoll FLOOR, FLOOR, CARPET, FLOOR, + tilecoll WALL, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, + tilecoll FLOOR, FLOOR, FLOOR, FLOOR, diff --git a/data/tilesets/traditional_house_collision.bin b/data/tilesets/traditional_house_collision.bin deleted file mode 100644 index dd778977ab87bb2e7f7e5020d8c17e817569b55d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmd6f!3}^g3&K>Z!nS*oT`r=M-v^{^J~aH< zv$y3AT-5kQEUFggtokfH4P7{OT_lJB*v8ZM|5w|?BGG$MulHnMeA(wXcjdbJ{!h=? P2=@QDBQ1EZ>3dzjrvV&c diff --git a/data/tilesets/west_collision.inc b/data/tilesets/west_collision.inc new file mode 100644 index 00000000..05593628 --- /dev/null +++ b/data/tilesets/west_collision.inc @@ -0,0 +1,128 @@ + tilecoll FF, FF, FF, FF, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_DOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_SIGNPOST, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_DOOR, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_SIGNPOST, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_SIGNPOST, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_CUT_TREE, + tilecoll OLD_CUT_TREE, OLD_WALL, OLD_CUT_TREE, OLD_WALL, + tilecoll OLD_WALL, OLD_CUT_TREE, OLD_WALL, OLD_WALL, + tilecoll OLD_CUT_TREE, OLD_CUT_TREE, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_STEPS | COLLFLAG_ENCOUNTER, OLD_STEPS | COLLFLAG_ENCOUNTER, OLD_LEDGE, OLD_LEDGE, + tilecoll OLD_FLOOR, OLD_STEPS | COLLFLAG_ENCOUNTER, OLD_FLOOR, OLD_LEDGE, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_GRASS | COLLFLAG_ENCOUNTER, OLD_GRASS | COLLFLAG_ENCOUNTER, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_WALL, OLD_FLOOR, OLD_CUT_TREE, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WATER, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WATER, OLD_WALL, + tilecoll OLD_WALL, OLD_WATER, OLD_WALL, OLD_WATER, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WATER, OLD_WALL, OLD_WATER, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WATER, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_CARPET, OLD_CARPET, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WATER, OLD_WATER, OLD_WATER, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WATER, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_DOOR, OLD_WALL, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WATER, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_FLOOR, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WATER, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_DOOR, + tilecoll OLD_WALL, OLD_WALL, OLD_DOOR, OLD_WALL, + tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, + tilecoll OLD_FLOOR, OLD_FLOOR, OLD_FLOOR, OLD_FLOOR diff --git a/engine/debug/field/change_transportation.inc b/engine/debug/field/change_transportation.inc index c8747837..f2fb29fb 100644 --- a/engine/debug/field/change_transportation.inc +++ b/engine/debug/field/change_transportation.inc @@ -134,10 +134,10 @@ TransportationList: FieldDebug_CheckFacingSurfable: push af call GetFacingTileCoord - and COLL_TYPE_MASK - cp OLD_HI_NYBBLE_WATER ; happens to match HI_NYBBLE_WATER + and COLLMASK_TYPE + cp COLLMASK_TYPE_OLD_WATER ; happens to match COLLMASK_TYPE_WATER jr z, .surfable - cp OLD_HI_NYBBLE_WATER_ALT + cp COLLMASK_TYPE_OLD_WATER_ALT jr z, .surfable ; not surfable pop af diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index 6a86a1ab..283d6c1c 100644 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -46,7 +46,7 @@ TryCut: CheckCuttableBlock: call GetFacingTileCoord - cp $80 + cp COLL_OLD_CUT_TREE jr nz, .fail call GetBlockLocation ld a, l @@ -125,8 +125,8 @@ IsCuttableTile: CuttableTiles: db COLL_OLD_GRASS_81 db COLL_OLD_GRASS_82 - db COLL_OLD_GRASS_82 | COLL_FLAG - db COLL_OLD_GRASS_83 | COLL_FLAG + db COLL_OLD_GRASS_82 | COLLFLAG_ENCOUNTER + db COLL_OLD_GRASS | COLLFLAG_ENCOUNTER db -1 FailCut: @@ -202,10 +202,10 @@ SurfFunction: TrySurf: call GetFacingTileCoord - and $f0 - cp $20 + and COLLMASK_TYPE + cp COLLMASK_TYPE_OLD_WATER jr z, .success - cp $40 + cp COLLMASK_TYPE_OLD_WATER_ALT jr z, .success set_script FailSurf xor a diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index ebc57d24..194acfa3 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -237,8 +237,8 @@ UpdateTallGrassFlags: ; This entire function was blanked out for the final game. See 'UselessAndA' in pokegold. ResetObjFlags2_7: ; This comparison is pointless because the instructions below it have been nop'd out. - and COLL_TYPE_MASK - cp HI_NYBBLE_WARPS + and COLLMASK_TYPE + cp COLLMASK_TYPE_WARPS nop nop @@ -272,24 +272,24 @@ SetTallGrassFlags: CheckGrassTile: ld d, a - and $f0 - cp HI_NYBBLE_TALL_GRASS + and COLLMASK_TYPE + cp COLLMASK_TYPE_TALL_GRASS jr z, .grass - cp HI_NYBBLE_WATER + cp COLLMASK_TYPE_WATER jr z, .water scf ret .grass ld a, d - and LO_NYBBLE_GRASS + and COLLMASK_SUBTYPE ret z scf ret ; For some reason, the above code is duplicated down here. .water ld a, d - and LO_NYBBLE_GRASS + and COLLMASK_SUBTYPE ret z scf ret diff --git a/engine/overworld/object_collision.asm b/engine/overworld/object_collision.asm index d1cabfab..35556daa 100644 --- a/engine/overworld/object_collision.asm +++ b/engine/overworld/object_collision.asm @@ -5,7 +5,7 @@ SECTION "engine/overworld/object_collision.asm", ROMX CanObjectMoveInDirection: ld hl, OBJECT_FLAGS1 add hl, bc - bit COLL_TILES_F, [hl] + bit NOCLIP_TILES_F, [hl] jr z, .noclip_tiles push hl call _IsObjectCollisionTileSolid @@ -13,7 +13,7 @@ CanObjectMoveInDirection: ret c .noclip_tiles - bit COLL_OBJS_F, [hl] + bit NOCLIP_OBJS_F, [hl] jr z, .noclip_objs push hl push bc @@ -68,7 +68,7 @@ CheckFacingObject: call GetFacingTileCoord cp COLL_COUNTER jr z, .counter - cp (COLL_COUNTER | COLL_FLAG) + cp (COLL_COUNTER | COLLFLAG_ENCOUNTER) jr nz, .not_counter .counter ld a, [wPlayerMapX] diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index ac67bb69..e113e4dc 100644 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -250,7 +250,7 @@ CheckSkateDown: jr nc, .can_skate cp COLL_OLD_LEDGE jr z, .jump - cp (COLL_OLD_ROCK | COLL_FLAG) + cp (COLL_OLD_PIT_SKATE | COLLFLAG_ENCOUNTER) jr nz, .collision .jump @@ -283,7 +283,7 @@ CheckSkateUp: jr c, .collision call IsPlayerCollisionTileSolid jr nc, .can_skate - cp (COLL_OLD_ROCK | COLL_FLAG) + cp (COLL_OLD_PIT_SKATE | COLLFLAG_ENCOUNTER) jr nz, .collision ld a, movement_fast_jump_step | UP ret @@ -314,7 +314,7 @@ CheckSkateLeft: jr c, .collision call IsPlayerCollisionTileSolid jr nc, .can_skate - cp (COLL_OLD_ROCK | COLL_FLAG) + cp (COLL_OLD_PIT_SKATE | COLLFLAG_ENCOUNTER) jr nz, .collision ld a, movement_fast_jump_step | LEFT ret @@ -345,7 +345,7 @@ CheckSkateRight: jr c, .collision call IsPlayerCollisionTileSolid jr nc, .can_skate - cp (COLL_OLD_ROCK | COLL_FLAG) + cp (COLL_OLD_PIT_SKATE | COLLFLAG_ENCOUNTER) jr nz, .collision ld a, movement_fast_jump_step | RIGHT ret @@ -374,11 +374,11 @@ OldIsTileCollisionGrass:: ; z - grass cp COLL_OLD_GRASS_82 ret z - cp COLL_OLD_GRASS_83 + cp COLL_OLD_GRASS ret z - cp (COLL_OLD_GRASS_82 | COLL_FLAG) + cp (COLL_OLD_GRASS_82 | COLLFLAG_ENCOUNTER) ret z - cp (COLL_OLD_GRASS_83 | COLL_FLAG) + cp (COLL_OLD_GRASS | COLLFLAG_ENCOUNTER) ret OldCheckMovementSurf:: @@ -490,10 +490,10 @@ OldIsTileCollisionWater:: ; Result: ; c - water ; nc - not water - and COLL_TYPE_MASK - cp OLD_HI_NYBBLE_WATER + and COLLMASK_TYPE + cp COLLMASK_TYPE_OLD_WATER ret z - cp OLD_HI_NYBBLE_WATER_ALT + cp COLLMASK_TYPE_OLD_WATER_ALT ret z scf ret @@ -593,7 +593,7 @@ GetPlayerMovementByState: CheckMovementWalk:: ld a, [wPlayerTile] swap a - and COLL_TYPE_MASK >> 4 + and COLLMASK_TYPE >> 4 ld hl, .WalkingCollisionTable jp CallJumptable @@ -624,7 +624,7 @@ CheckMovementWalkSolid:: CheckMovementWalkLand:: ld a, [wPlayerTile] - and COLL_SUBTYPE_MASK + and COLLMASK_SUBTYPE jr nz, .force_movement call CheckMovementWalkRegular call SlowDownMovementWalk @@ -632,16 +632,16 @@ CheckMovementWalkLand:: .force_movement ld b, movement_step | DOWN - cp (COLL_LAND_S & COLL_SUBTYPE_MASK) + cp (COLL_LAND_S & COLLMASK_SUBTYPE) jr z, .finish ld b, movement_step | UP - cp (COLL_LAND_N & COLL_SUBTYPE_MASK) + cp (COLL_LAND_N & COLLMASK_SUBTYPE) jr z, .finish ld b, movement_step | LEFT - cp (COLL_LAND_W & COLL_SUBTYPE_MASK) + cp (COLL_LAND_W & COLLMASK_SUBTYPE) jr z, .finish ld b, movement_step | RIGHT - cp (COLL_LAND_E & COLL_SUBTYPE_MASK) + cp (COLL_LAND_E & COLLMASK_SUBTYPE) jr z, .finish ; fall-through --> map other codes to COLL_LAND_E .finish @@ -668,18 +668,18 @@ SlowDownMovementWalk: CheckMovementWalkLand2:: ld a, [wPlayerTile] - and COLL_SUBTYPE_MASK + and COLLMASK_SUBTYPE ld b, movement_step | DOWN - cp (COLL_LAND2_S & COLL_SUBTYPE_MASK) + cp (COLL_LAND2_S & COLLMASK_SUBTYPE) jr z, .finish ld b, movement_step | UP - cp (COLL_LAND2_N & COLL_SUBTYPE_MASK) + cp (COLL_LAND2_N & COLLMASK_SUBTYPE) jr z, .finish ld b, movement_step | LEFT - cp (COLL_LAND2_W & COLL_SUBTYPE_MASK) + cp (COLL_LAND2_W & COLLMASK_SUBTYPE) jr z, .finish ld b, movement_step | RIGHT - cp (COLL_LAND2_E & COLL_SUBTYPE_MASK) + cp (COLL_LAND2_E & COLLMASK_SUBTYPE) jr z, .finish ; fall-through --> map other codes to COLL_LAND2_E .finish @@ -691,12 +691,12 @@ UnusedCheckMovementWalk60:: CheckMovementWalkWarp:: ld a, [wPlayerTile] - and COLL_SUBTYPE_MASK + and COLLMASK_SUBTYPE jr z, .check_dpad cp 1 jr z, .move_down ld a, [wPlayerTile] - cp $7a + cp (COLL_LADDER | COLLFLAG_ENCOUNTER) jr z, .move_down jp CheckMovementWalkRegular .move_down @@ -779,12 +779,12 @@ CheckMovementWalkJump: .down ld a, [wPlayerTile] - and COLL_SUBTYPE_MASK - cp (COLL_JUMP_S & COLL_SUBTYPE_MASK) + and COLLMASK_SUBTYPE + cp (COLL_JUMP_S & COLLMASK_SUBTYPE) jr z, .jump_down - cp (COLL_JUMP_SE & COLL_SUBTYPE_MASK) + cp (COLL_JUMP_SE & COLLMASK_SUBTYPE) jr z, .jump_down - cp (COLL_JUMP_SW & COLL_SUBTYPE_MASK) + cp (COLL_JUMP_SW & COLLMASK_SUBTYPE) jr z, .jump_down jp CheckWalkDown .jump_down @@ -793,12 +793,12 @@ CheckMovementWalkJump: .up ld a, [wPlayerTile] - and COLL_SUBTYPE_MASK - cp (COLL_JUMP_N & COLL_SUBTYPE_MASK) + and COLLMASK_SUBTYPE + cp (COLL_JUMP_N & COLLMASK_SUBTYPE) jr z, .jump_up - cp (COLL_JUMP_NE & COLL_SUBTYPE_MASK) + cp (COLL_JUMP_NE & COLLMASK_SUBTYPE) jr z, .jump_up - cp (COLL_JUMP_NW & COLL_SUBTYPE_MASK) + cp (COLL_JUMP_NW & COLLMASK_SUBTYPE) jr z, .jump_up jp CheckWalkUp .jump_up @@ -807,12 +807,12 @@ CheckMovementWalkJump: .left ld a, [wPlayerTile] - and COLL_SUBTYPE_MASK - cp (COLL_JUMP_W & COLL_SUBTYPE_MASK) + and COLLMASK_SUBTYPE + cp (COLL_JUMP_W & COLLMASK_SUBTYPE) jr z, .jump_left - cp (COLL_JUMP_SW & COLL_SUBTYPE_MASK) + cp (COLL_JUMP_SW & COLLMASK_SUBTYPE) jr z, .jump_left - cp (COLL_JUMP_NW & COLL_SUBTYPE_MASK) + cp (COLL_JUMP_NW & COLLMASK_SUBTYPE) jr z, .jump_left jp CheckWalkLeft .jump_left @@ -821,12 +821,12 @@ CheckMovementWalkJump: .right ld a, [wPlayerTile] - and COLL_SUBTYPE_MASK - cp (COLL_JUMP_E & COLL_SUBTYPE_MASK) + and COLLMASK_SUBTYPE + cp (COLL_JUMP_E & COLLMASK_SUBTYPE) jr z, .jump_right - cp (COLL_JUMP_SE & COLL_SUBTYPE_MASK) + cp (COLL_JUMP_SE & COLLMASK_SUBTYPE) jr z, .jump_right - cp (COLL_JUMP_NE & COLL_SUBTYPE_MASK) + cp (COLL_JUMP_NE & COLLMASK_SUBTYPE) jr z, .jump_right jp CheckWalkRight .jump_right @@ -892,7 +892,7 @@ CheckWalkRight:: CheckMovementSurf:: ld a, [wPlayerTile] swap a - and COLL_TYPE_MASK >> 4 + and COLLMASK_TYPE >> 4 ld hl, .SurfCollisionTable jp CallJumptable @@ -928,8 +928,8 @@ CheckMovementSurfRegular:: CheckMovementSurfWater:: ld a, [wPlayerTile] - and COLL_SUBTYPE_MASK - cp (COLL_WATERFALL & COLL_SUBTYPE_MASK) + and COLLMASK_SUBTYPE + cp (COLL_WATERFALL & COLLMASK_SUBTYPE) jr nz, CheckMovementSurfRegular ; waterfall ld a, movement_big_step | DOWN @@ -937,17 +937,17 @@ CheckMovementSurfWater:: CheckMovementSurfWater2:: ld a, [wPlayerTile] - and COLL_WATER_SUBTYPE_MASK + and COLLMASK_WATER_SUBTYPE ld d, movement_step | RIGHT jr z, .finish ; COLL_WATER2_E ld d, movement_step | LEFT - cp (COLL_WATER2_W & COLL_WATER_SUBTYPE_MASK) + cp (COLL_WATER2_W & COLLMASK_WATER_SUBTYPE) jr z, .finish ld d, movement_step | UP - cp (COLL_WATER2_N & COLL_WATER_SUBTYPE_MASK) + cp (COLL_WATER2_N & COLLMASK_WATER_SUBTYPE) jr z, .finish ld d, movement_step | DOWN - cp (COLL_WATER2_S & COLL_WATER_SUBTYPE_MASK) + cp (COLL_WATER2_S & COLLMASK_WATER_SUBTYPE) jr z, .finish ; fall-through --> no aliasing due to mask .finish diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 2433991d..cfe3c06e 100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -292,7 +292,7 @@ CopyMapObjectToObjectStruct:: InitObjectFlags:: ld hl, OBJECT_FLAGS1 add hl, de - ld [hl], COLL_OBJS | NOCLIP_NOT_SET | COLL_TILES + ld [hl], NOCLIP_OBJS | NOCLIP_NOT_SET | NOCLIP_TILES ldh a, [hObjectStructIndex] push hl ld hl, wCenteredObject @@ -316,7 +316,7 @@ InitObjectFlags:: ldh a, [hObjectStructIndex] cp PLAYER_OBJECT_INDEX ret z - set COLL_TILES_F, [hl] + set NOCLIP_TILES_F, [hl] ret CopyMapObject_Radius: diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index b38d414c..af41e6f7 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -226,15 +226,15 @@ TryWildBattle:: ret .blocks - db COLL_FLOOR | COLL_FLAG - db COLL_GRASS | COLL_FLAG - db COLL_WATER_20 | COLL_FLAG - db COLL_WATER | COLL_FLAG - db COLL_OLD_WATERFALL | COLL_FLAG - db COLL_OLD_HOTSPRING | COLL_FLAG - db COLL_OLD_42 | COLL_FLAG - db COLL_OLD_43 | COLL_FLAG - db COLL_OLD_WHIRLPOOL | COLL_FLAG + db COLL_FLOOR | COLLFLAG_ENCOUNTER + db COLL_GRASS | COLLFLAG_ENCOUNTER + db COLL_WATER_20 | COLLFLAG_ENCOUNTER + db COLL_WATER | COLLFLAG_ENCOUNTER + db COLL_OLD_WATERFALL | COLLFLAG_ENCOUNTER + db COLL_OLD_MUDPIT | COLLFLAG_ENCOUNTER + db COLL_OLD_42 | COLLFLAG_ENCOUNTER + db COLL_OLD_43 | COLLFLAG_ENCOUNTER + db COLL_OLD_WHIRLPOOL | COLLFLAG_ENCOUNTER db -1 INCLUDE "data/wild/probabilities.inc" diff --git a/gfx/gfx.asm b/gfx/gfx.asm index 2f8a2119..589f03ec 100644 --- a/gfx/gfx.asm +++ b/gfx/gfx.asm @@ -130,7 +130,7 @@ INCBIN "gfx/tilesets/west.common.2bpp" West_Meta: INCBIN "data/tilesets/west_metatiles.bin" West_Coll: -INCBIN "data/tilesets/west_collision.bin" +INCLUDE "data/tilesets/west_collision.inc" SECTION "gfx.asm@Bank 6 Tilesets House", ROMX House_GFX: @@ -138,7 +138,7 @@ INCBIN "gfx/tilesets/house.2bpp" House_Meta: INCBIN "data/tilesets/house_metatiles.bin" House_Coll: -INCBIN "data/tilesets/house_collision.bin" +INCLUDE "data/tilesets/house_collision.inc" SECTION "gfx.asm@Bank 7 Tilesets Rocket House", ROMX RocketHouse_GFX: @@ -146,7 +146,7 @@ INCBIN "gfx/tilesets/rocket_house.2bpp" RocketHouse_Meta: INCBIN "data/tilesets/rocket_house_metatiles.bin" RocketHouse_Coll: -INCBIN "data/tilesets/rocket_house_collision.bin" +INCLUDE "data/tilesets/rocket_house_collision.inc" SECTION "gfx.asm@Bank 7 Tilesets Aquarium", ROMX Aquarium_GFX: @@ -154,7 +154,7 @@ INCBIN "gfx/tilesets/aquarium.2bpp" Aquarium_Meta: INCBIN "data/tilesets/aquarium_metatiles.bin" Aquarium_Coll: -INCBIN "data/tilesets/aquarium_collision.bin" +INCLUDE "data/tilesets/aquarium_collision.inc" SECTION "gfx.asm@Bank 7 Tilesets Bull Forest", ROMX BullForest_GFX: @@ -162,7 +162,7 @@ INCBIN "gfx/tilesets/bull_forest.common.2bpp" BullForest_Meta: INCBIN "data/tilesets/bull_forest_metatiles.bin" BullForest_Coll: -INCBIN "data/tilesets/bull_forest_collision.bin" +INCLUDE "data/tilesets/bull_forest_collision.inc" SECTION "gfx.asm@Bank 7 Tilesets Fonto", ROMX Fonto_GFX: @@ -170,7 +170,7 @@ INCBIN "gfx/tilesets/fonto.common.2bpp" Fonto_Meta: INCBIN "data/tilesets/fonto_metatiles.bin" Fonto_Coll: -INCBIN "data/tilesets/fonto_collision.bin" +INCLUDE "data/tilesets/fonto_collision.inc" SECTION "gfx.asm@Bank 7 Tilesets Haiteku", ROMX Haiteku_GFX: @@ -178,7 +178,7 @@ INCBIN "gfx/tilesets/haiteku.common.2bpp" Haiteku_Meta: INCBIN "data/tilesets/haiteku_metatiles.bin" Haiteku_Coll: -INCBIN "data/tilesets/haiteku_collision.bin" +INCLUDE "data/tilesets/haiteku_collision.inc" SECTION "gfx.asm@Bank 8 Tilesets Baadon", ROMX Baadon_GFX: @@ -186,7 +186,7 @@ INCBIN "gfx/tilesets/baadon.common.2bpp" Baadon_Meta: INCBIN "data/tilesets/baadon_metatiles.bin" Baadon_Coll: -INCBIN "data/tilesets/baadon_collision.bin" +INCLUDE "data/tilesets/baadon_collision.inc" SECTION "gfx.asm@Bank 8 Tilesets Kanto", ROMX Kanto_GFX: @@ -194,7 +194,7 @@ INCBIN "gfx/tilesets/kanto.common.2bpp" Kanto_Meta: INCBIN "data/tilesets/kanto_metatiles.bin" Kanto_Coll: -INCBIN "data/tilesets/kanto_collision.bin" +INCLUDE "data/tilesets/kanto_collision.inc" SECTION "gfx.asm@Bank 8 Tilesets South", ROMX South_GFX: @@ -202,7 +202,7 @@ INCBIN "gfx/tilesets/south.common.2bpp" South_Meta: INCBIN "data/tilesets/south_metatiles.bin" South_Coll: -INCBIN "data/tilesets/south_collision.bin" +INCLUDE "data/tilesets/south_collision.inc" SECTION "gfx.asm@Bank 8 Tilesets Tower", ROMX Tower_GFX: @@ -210,7 +210,7 @@ INCBIN "gfx/tilesets/tower.2bpp" Tower_Meta: INCBIN "data/tilesets/tower_metatiles.bin" Tower_Coll: -INCBIN "data/tilesets/tower_collision.bin" +INCLUDE "data/tilesets/tower_collision.inc" SECTION "gfx.asm@Bank 8 Tilesets Gate", ROMX Gate_GFX: @@ -218,7 +218,7 @@ INCBIN "gfx/tilesets/gate.2bpp" Gate_Meta: INCBIN "data/tilesets/gate_metatiles.bin" Gate_Coll: -INCBIN "data/tilesets/gate_collision.bin" +INCLUDE "data/tilesets/gate_collision.inc" SECTION "gfx.asm@Gameboy GFX", ROMX TradeGameBoyGFX:: @@ -230,7 +230,7 @@ INCBIN "gfx/tilesets/radio_tower.2bpp" RadioTower_Meta: INCBIN "data/tilesets/radio_tower_metatiles.bin" RadioTower_Coll: -INCBIN "data/tilesets/radio_tower_collision.bin" +INCLUDE "data/tilesets/radio_tower_collision.inc" SECTION "gfx.asm@Bank C Tilesets Traditional House", ROMX TraditionalHouse_GFX: @@ -238,7 +238,7 @@ INCBIN "gfx/tilesets/traditional_house.2bpp" TraditionalHouse_Meta: INCBIN "data/tilesets/traditional_house_metatiles.bin" TraditionalHouse_Coll: -INCBIN "data/tilesets/traditional_house_collision.bin" +INCLUDE "data/tilesets/traditional_house_collision.inc" SECTION "gfx.asm@Bank C Tilesets Mart", ROMX Mart_GFX: @@ -246,7 +246,7 @@ INCBIN "gfx/tilesets/mart.2bpp" Mart_Meta: INCBIN "data/tilesets/mart_metatiles.bin" Mart_Coll: -INCBIN "data/tilesets/mart_collision.bin" +INCLUDE "data/tilesets/mart_collision.inc" SECTION "gfx.asm@Bank C Tilesets Gym", ROMX Gym_GFX: @@ -254,7 +254,7 @@ INCBIN "gfx/tilesets/gym.2bpp" Gym_Meta: INCBIN "data/tilesets/gym_metatiles.bin" Gym_Coll: -INCBIN "data/tilesets/gym_collision.bin" +INCLUDE "data/tilesets/gym_collision.inc" SECTION "gfx.asm@Bank C Tilesets Pokecenter", ROMX Pokecenter_GFX: @@ -262,7 +262,7 @@ INCBIN "gfx/tilesets/pokecenter.2bpp" Pokecenter_Meta: INCBIN "data/tilesets/pokecenter_metatiles.bin" Pokecenter_Coll: -INCBIN "data/tilesets/pokecenter_collision.bin" +INCLUDE "data/tilesets/pokecenter_collision.inc" SECTION "gfx.asm@Bank C Tilesets Common", ROMX CommonExteriorTilesGFX: @@ -329,7 +329,7 @@ INCBIN "gfx/tilesets/lab.2bpp" Lab_Meta: INCBIN "data/tilesets/lab_metatiles.bin" Lab_Coll: -INCBIN "data/tilesets/lab_collision.bin" +INCLUDE "data/tilesets/lab_collision.inc" SECTION "gfx.asm@Bank 13 Tilesets Ruins Of Alph", ROMX RuinsOfAlph_GFX: @@ -337,7 +337,7 @@ INCBIN "gfx/tilesets/ruins_of_alph.2bpp" RuinsOfAlph_Meta: INCBIN "data/tilesets/ruins_of_alph_metatiles.bin" RuinsOfAlph_Coll: -INCBIN "data/tilesets/ruins_of_alph_collision.bin" +INCLUDE "data/tilesets/ruins_of_alph_collision.inc" SECTION "gfx.asm@Bank 13 Tilesets Ship", ROMX Ship_GFX: @@ -345,7 +345,7 @@ INCBIN "gfx/tilesets/ship.common.2bpp" Ship_Meta: INCBIN "data/tilesets/ship_metatiles.bin" Ship_Coll: -INCBIN "data/tilesets/ship_collision.bin" +INCLUDE "data/tilesets/ship_collision.inc" SECTION "gfx.asm@Bank 13 Tilesets Ship Port", ROMX ShipPort_GFX: @@ -353,7 +353,7 @@ INCBIN "gfx/tilesets/ship_port.common.2bpp" ShipPort_Meta: INCBIN "data/tilesets/ship_port_metatiles.bin" ShipPort_Coll: -INCBIN "data/tilesets/ship_port_collision.bin" +INCLUDE "data/tilesets/ship_port_collision.inc" SECTION "gfx.asm@PKMN Sprite Bank List", ROMX INCLUDE "gfx/pokemon/pkmn_pic_banks.inc" @@ -539,7 +539,7 @@ INCBIN "gfx/tilesets/dept_store.2bpp" DeptStore_Meta: INCBIN "data/tilesets/dept_store_metatiles.bin" DeptStore_Coll: -INCBIN "data/tilesets/dept_store_collision.bin" +INCLUDE "data/tilesets/dept_store_collision.inc" SECTION "gfx.asm@Bank 37 Tilesets Office", ROMX Office_GFX: @@ -547,7 +547,7 @@ INCBIN "gfx/tilesets/office.2bpp" Office_Meta: INCBIN "data/tilesets/office_metatiles.bin" Office_Coll: -INCBIN "data/tilesets/office_collision.bin" +INCLUDE "data/tilesets/office_collision.inc" SECTION "gfx.asm@Bank 37 Tilesets Cave", ROMX Cave_GFX: @@ -555,7 +555,7 @@ INCBIN "gfx/tilesets/cave.2bpp" Cave_Meta: INCBIN "data/tilesets/cave_metatiles.bin" Cave_Coll: -INCBIN "data/tilesets/cave_collision.bin" +INCLUDE "data/tilesets/cave_collision.inc" SECTION "gfx.asm@Bank 37 Tilesets Power Plant", ROMX PowerPlant_GFX: @@ -563,7 +563,7 @@ INCBIN "gfx/tilesets/power_plant.2bpp" PowerPlant_Meta: INCBIN "data/tilesets/power_plant_metatiles.bin" PowerPlant_Coll: -INCBIN "data/tilesets/power_plant_collision.bin" +INCLUDE "data/tilesets/power_plant_collision.inc" SECTION "gfx.asm@Poker GFX", ROMX PokerGFX:: diff --git a/home/map.asm b/home/map.asm index 0cd54b26..ebb0c189 100644 --- a/home/map.asm +++ b/home/map.asm @@ -375,7 +375,7 @@ MapSetup_Warp:: call GetSGBLayout call LoadWildMonData call FadeIn - call Function2407 ; TODO + call CheckExitTiles ret LoadMapTimeOfDay:: @@ -439,13 +439,13 @@ FadeIn:: ; This is not OverworldFadeIn, but I don't know what it is call RefreshTiles ld hl, wStateFlags set SPRITE_UPDATES_DISABLED_F, [hl] - call Function2407 + call CheckExitTiles callfar InitSprites call DelayFrame callfar OverworldFadeIn ret -Function2407:: +CheckExitTiles:: ld a, movement_step_sleep ld [wPlayerMovement], a xor a @@ -454,15 +454,15 @@ Function2407:: and %00001100 ld [wPlayerFacing], a ld a, [wPlayerTile] - and COLL_TYPE_MASK - cp HI_NYBBLE_WARPS + and COLLMASK_TYPE + cp COLLMASK_TYPE_WARPS ret nz ld a, [wPlayerTile] - cp COLL_STEPS + cp COLL_LADDER ret z cp COLL_CARPET ret z - cp $78 + cp (COLL_CARPET | COLLFLAG_ENCOUNTER) ret z Function242c:: ld a, $0