Create data/collision/ for tile collision-related data

7 files changed, 8 insertions, 5 deletions

diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm
index c965b2f5..54d6ac54 100644
--- a/constants/collision_constants.asm
+++ b/constants/collision_constants.asm
@@ -1,11 +1,11 @@
-; collision permissions (see data/collision_permissions.asm)
+; collision permissions (see data/collision/collision_permissions.asm)
 LAND_TILE  EQU $00
 WATER_TILE EQU $01
 WALL_TILE  EQU $0f
 TALK       EQU $10
 
 ; collision data types (see data/tilesets/*_collision.asm)
-; TileCollisionTable indexes (see data/collision_permissions.asm)
+; TileCollisionTable indexes (see data/collision/collision_permissions.asm)
 COLL_FLOOR             EQU $00
 COLL_01                EQU $01 ; garbage
 COLL_03                EQU $03 ; garbage
diff --git a/data/collision_permissions.asm b/data/collision/collision_permissions.asm
index 57172ca5..57172ca5 100644
--- a/data/collision_permissions.asm
+++ b/data/collision/collision_permissions.asm
diff --git a/data/events/collision_stdscripts.asm b/data/collision/collision_stdscripts.asm
index 5c94c62f..5c94c62f 100644
--- a/data/events/collision_stdscripts.asm
+++ b/data/collision/collision_stdscripts.asm
diff --git a/data/events/field_move_blocks.asm b/data/collision/field_move_blocks.asm
index fea80f53..444be14b 100644
--- a/data/events/field_move_blocks.asm
+++ b/data/collision/field_move_blocks.asm
@@ -1,3 +1,4 @@
+; these blocks all use COLL_CUT_TREE in one quadrant
 CutTreeBlockPointers:
 ; tileset, block list pointer
 	dbw TILESET_JOHTO,        .johto
@@ -42,6 +43,8 @@ CutTreeBlockPointers:
 	db $0f, $17, 0
 	db -1 ; end
 
+
+; these blocks all use COLL_WHIRLPOOL in one quadrant
 WhirlpoolBlockPointers:
 	dbw TILESET_JOHTO, .johto
 	db -1 ; end
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index 1f82b3a9..f41897ca 100644
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -268,7 +268,7 @@ CheckOverworldTileArrays:
 	xor a
 	ret
 
-INCLUDE "data/events/field_move_blocks.asm"
+INCLUDE "data/collision/field_move_blocks.asm"
 
 FlashFunction:
 	call .CheckUseFlash
diff --git a/engine/events/std_collision.asm b/engine/events/std_collision.asm
index 8c54c041..5ab11268 100644
--- a/engine/events/std_collision.asm
+++ b/engine/events/std_collision.asm
@@ -23,7 +23,7 @@ CheckFacingTileForStdScript::
 	xor a
 	ret
 
-INCLUDE "data/events/collision_stdscripts.asm"
+INCLUDE "data/collision/collision_stdscripts.asm"
 
 Script_JumpStdFromRAM:
 	sjump wJumpStdScriptBuffer
diff --git a/main.asm b/main.asm
index 8f5883cd..4b25387f 100644
--- a/main.asm
+++ b/main.asm
@@ -350,7 +350,7 @@ INCLUDE "engine/movie/intro.asm"
 SECTION "bank3E", ROMX
 
 INCLUDE "engine/gfx/load_font.asm"
-INCLUDE "data/collision_permissions.asm"
+INCLUDE "data/collision/collision_permissions.asm"
 
 Shrink1Pic:
 INCBIN "gfx/new_game/shrink1.2bpp.lz"