pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Create COLL_OUT_OF_BOUNDS to handle isolated areas within the same map that should not be visible in View Map mode (#29)

Browse Source
This commit is contained in:
xCrystal
2023-12-14 21:24:08 +01:00
parent 78b8f05fb7
commit 7ede3d1357
11 changed files with 102 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/collision/collision_permissions.asm
View File

@@ -256,5 +256,5 @@ TileCollisionTable::
db LAND_TILE ; fc
db LAND_TILE ; fd
db LAND_TILE ; fe
db WALL_TILE ; COLL_FF
db WALL_TILE ; COLL_OUT_OF_BOUNDS
assert_table_length $100

4
data/maps/attributes.asm
View File

@@ -114,9 +114,9 @@ if DEF(_DEBUG)
map_attributes DebugLevel3_Map1, DEBUGLEVEL_3_MAP_1, $00, 0
map_attributes DebugLevel4_Map1, DEBUGLEVEL_4_MAP_1, $05, SOUTH
map_attributes DebugLevel4_Map1, DEBUGLEVEL_4_MAP_1, $00, SOUTH
connection south, DebugLevel5_Map1, DEBUGLEVEL_5_MAP_1, -1
map_attributes DebugLevel5_Map1, DEBUGLEVEL_5_MAP_1, $05, NORTH
map_attributes DebugLevel5_Map1, DEBUGLEVEL_5_MAP_1, $00, NORTH
connection north, DebugLevel4_Map1, DEBUGLEVEL_4_MAP_1, 1
endc

2
data/tilesets/board_debug_1_collision.asm
View File

@@ -1,4 +1,4 @@
tilecoll 01, 01, 01, 01 ; 00
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 00
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03

BIN
data/tilesets/board_debug_1_metatiles.bin
View File

Binary file not shown.

2
data/tilesets/board_debug_2_collision.asm
View File

@@ -1,4 +1,4 @@
tilecoll WALL, WALL, WALL, WALL ; 00
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 00
tilecoll WALL, WALL, WALL, WALL ; 01
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03

52
data/tilesets/players_room_collision.asm
View File

@@ -36,29 +36,29 @@
tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 23
tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 24
tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 25
tilecoll FF, FF, FF, FF ; 26
tilecoll FF, FF, FF, FF ; 27
tilecoll FF, FF, FF, FF ; 28
tilecoll FF, FF, FF, FF ; 29
tilecoll FF, FF, FF, FF ; 2a
tilecoll FF, FF, FF, FF ; 2b
tilecoll FF, FF, FF, FF ; 2c
tilecoll FF, FF, FF, FF ; 2d
tilecoll FF, FF, FF, FF ; 2e
tilecoll FF, FF, FF, FF ; 2f
tilecoll FF, FF, FF, FF ; 30
tilecoll FF, FF, FF, FF ; 31
tilecoll FF, FF, FF, FF ; 32
tilecoll FF, FF, FF, FF ; 33
tilecoll FF, FF, FF, FF ; 34
tilecoll FF, FF, FF, FF ; 35
tilecoll FF, FF, FF, FF ; 36
tilecoll FF, FF, FF, FF ; 37
tilecoll FF, FF, FF, FF ; 38
tilecoll FF, FF, FF, FF ; 39
tilecoll FF, FF, FF, FF ; 3a
tilecoll FF, FF, FF, FF ; 3b
tilecoll FF, FF, FF, FF ; 3c
tilecoll FF, FF, FF, FF ; 3d
tilecoll FF, FF, FF, FF ; 3e
tilecoll FF, FF, FF, FF ; 3f
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 26
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 27
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 28
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 29
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 2a
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 2b
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 2c
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 2d
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 2e
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 2f
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 30
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 31
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 32
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 33
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 34
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 35
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 36
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 37
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 38
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 39
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 3a
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 3b
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 3c
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 3d
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 3e
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 3f

2
data/tilesets/train_station_collision.asm
View File

@@ -1,4 +1,4 @@
tilecoll FF, FF, FF, FF ; 00
tilecoll OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS, OUT_OF_BOUNDS ; 00
tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 01
tilecoll UP_WALL, FLOOR, UP_WALL, FLOOR ; 02
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03