summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-10-27 10:00:56 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-10-27 10:00:56 -0400
commit2738858985dbcff55c2ec237ac6075b4263f3120 (patch)
tree8a9d089983a0906af0e6cccb29af2c9d58a8dd47 /data
parent66ddeeff6c8f8142f522fd5fc3bc6269cec7ae7c (diff)
Create data/collision/ for tile collision-related data
Diffstat (limited to 'data')
-rw-r--r--data/collision/collision_permissions.asm (renamed from data/collision_permissions.asm)0
-rw-r--r--data/collision/collision_stdscripts.asm (renamed from data/events/collision_stdscripts.asm)0
-rw-r--r--data/collision/field_move_blocks.asm (renamed from data/events/field_move_blocks.asm)3
3 files changed, 3 insertions, 0 deletions
diff --git a/data/collision_permissions.asm b/data/collision/collision_permissions.asm
index 57172ca51..57172ca51 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 5c94c62f9..5c94c62f9 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 fea80f537..444be14bb 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