summaryrefslogtreecommitdiff
path: root/data/collision
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2015-09-22 12:07:59 -0700
committerMarcus Huderle <huderlem@gmail.com>2015-09-22 12:07:59 -0700
commit1cd5c259c2cd642e752a66b7cb93b4b263455589 (patch)
tree3325513428e9141f55c675b2be68d03d7bbdabff /data/collision
parentc77a062c56102e9159fe1c213db6d9ec895b2085 (diff)
Dump collision masks and move collision maps to different folder.
Diffstat (limited to 'data/collision')
-rwxr-xr-xdata/collision/maps/blue_stage_bottom.collision (renamed from data/collision/blue_stage_bottom.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/blue_stage_top.collision (renamed from data/collision/blue_stage_top.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/blue_stage_top_ball_entrance.collision (renamed from data/collision/blue_stage_top_ball_entrance.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/diglett_bonus.collision (renamed from data/collision/diglett_bonus.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/diglett_bonus_ball_entrance.collision (renamed from data/collision/diglett_bonus_ball_entrance.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/gengar_bonus.collision (renamed from data/collision/gengar_bonus.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/gengar_bonus_ball_entrance.collision (renamed from data/collision/gengar_bonus_ball_entrance.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/meowth_bonus.collision (renamed from data/collision/meowth_bonus.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/meowth_bonus_ball_entrance.collision (renamed from data/collision/meowth_bonus_ball_entrance.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/mewtwo_bonus.collision (renamed from data/collision/mewtwo_bonus.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/mewtwo_bonus_ball_entrance.collision (renamed from data/collision/mewtwo_bonus_ball_entrance.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/red_stage_bottom.collision (renamed from data/collision/red_stage_bottom.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/red_stage_top_0.collision (renamed from data/collision/red_stage_top_0.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/red_stage_top_1.collision (renamed from data/collision/red_stage_top_1.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/red_stage_top_2.collision (renamed from data/collision/red_stage_top_2.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/red_stage_top_3.collision (renamed from data/collision/red_stage_top_3.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/red_stage_top_4.collision (renamed from data/collision/red_stage_top_4.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/red_stage_top_5.collision (renamed from data/collision/red_stage_top_5.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/red_stage_top_6.collision (renamed from data/collision/red_stage_top_6.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/red_stage_top_7.collision (renamed from data/collision/red_stage_top_7.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/seel_bonus.collision (renamed from data/collision/seel_bonus.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/maps/seel_bonus_ball_entrance.collision (renamed from data/collision/seel_bonus_ball_entrance.collision)bin1024 -> 1024 bytes
-rwxr-xr-xdata/collision/masks/blue_stage_bottom.masksbin0 -> 2048 bytes
-rwxr-xr-xdata/collision/masks/blue_stage_top.masksbin0 -> 2048 bytes
-rwxr-xr-xdata/collision/masks/diglett_bonus.masksbin0 -> 768 bytes
-rwxr-xr-xdata/collision/masks/gengar_bonus.masksbin0 -> 384 bytes
-rwxr-xr-xdata/collision/masks/meowth_bonus.masksbin0 -> 256 bytes
-rwxr-xr-xdata/collision/masks/mewtwo_bonus.masksbin0 -> 256 bytes
-rwxr-xr-xdata/collision/masks/red_stage_bottom.masksbin0 -> 1024 bytes
-rwxr-xr-xdata/collision/masks/red_stage_top_0.masksbin0 -> 2048 bytes
-rwxr-xr-xdata/collision/masks/red_stage_top_1.masksbin0 -> 2048 bytes
-rwxr-xr-xdata/collision/masks/red_stage_top_2.masksbin0 -> 2048 bytes
-rwxr-xr-xdata/collision/masks/red_stage_top_3.masksbin0 -> 2048 bytes
-rwxr-xr-xdata/collision/masks/seel_bonus.masksbin0 -> 256 bytes
34 files changed, 0 insertions, 0 deletions
diff --git a/data/collision/blue_stage_bottom.collision b/data/collision/maps/blue_stage_bottom.collision
index 742e129..742e129 100755
--- a/data/collision/blue_stage_bottom.collision
+++ b/data/collision/maps/blue_stage_bottom.collision
Binary files differ
diff --git a/data/collision/blue_stage_top.collision b/data/collision/maps/blue_stage_top.collision
index 8a9f9b7..8a9f9b7 100755
--- a/data/collision/blue_stage_top.collision
+++ b/data/collision/maps/blue_stage_top.collision
Binary files differ
diff --git a/data/collision/blue_stage_top_ball_entrance.collision b/data/collision/maps/blue_stage_top_ball_entrance.collision
index 1ab8ae4..1ab8ae4 100755
--- a/data/collision/blue_stage_top_ball_entrance.collision
+++ b/data/collision/maps/blue_stage_top_ball_entrance.collision
Binary files differ
diff --git a/data/collision/diglett_bonus.collision b/data/collision/maps/diglett_bonus.collision
index 41f0082..41f0082 100755
--- a/data/collision/diglett_bonus.collision
+++ b/data/collision/maps/diglett_bonus.collision
Binary files differ
diff --git a/data/collision/diglett_bonus_ball_entrance.collision b/data/collision/maps/diglett_bonus_ball_entrance.collision
index 9ac6774..9ac6774 100755
--- a/data/collision/diglett_bonus_ball_entrance.collision
+++ b/data/collision/maps/diglett_bonus_ball_entrance.collision
Binary files differ
diff --git a/data/collision/gengar_bonus.collision b/data/collision/maps/gengar_bonus.collision
index ba1acd6..ba1acd6 100755
--- a/data/collision/gengar_bonus.collision
+++ b/data/collision/maps/gengar_bonus.collision
Binary files differ
diff --git a/data/collision/gengar_bonus_ball_entrance.collision b/data/collision/maps/gengar_bonus_ball_entrance.collision
index a5558f3..a5558f3 100755
--- a/data/collision/gengar_bonus_ball_entrance.collision
+++ b/data/collision/maps/gengar_bonus_ball_entrance.collision
Binary files differ
diff --git a/data/collision/meowth_bonus.collision b/data/collision/maps/meowth_bonus.collision
index 03f57b8..03f57b8 100755
--- a/data/collision/meowth_bonus.collision
+++ b/data/collision/maps/meowth_bonus.collision
Binary files differ
diff --git a/data/collision/meowth_bonus_ball_entrance.collision b/data/collision/maps/meowth_bonus_ball_entrance.collision
index 4c155fc..4c155fc 100755
--- a/data/collision/meowth_bonus_ball_entrance.collision
+++ b/data/collision/maps/meowth_bonus_ball_entrance.collision
Binary files differ
diff --git a/data/collision/mewtwo_bonus.collision b/data/collision/maps/mewtwo_bonus.collision
index 60458b5..60458b5 100755
--- a/data/collision/mewtwo_bonus.collision
+++ b/data/collision/maps/mewtwo_bonus.collision
Binary files differ
diff --git a/data/collision/mewtwo_bonus_ball_entrance.collision b/data/collision/maps/mewtwo_bonus_ball_entrance.collision
index a734eff..a734eff 100755
--- a/data/collision/mewtwo_bonus_ball_entrance.collision
+++ b/data/collision/maps/mewtwo_bonus_ball_entrance.collision
Binary files differ
diff --git a/data/collision/red_stage_bottom.collision b/data/collision/maps/red_stage_bottom.collision
index ed60762..ed60762 100755
--- a/data/collision/red_stage_bottom.collision
+++ b/data/collision/maps/red_stage_bottom.collision
Binary files differ
diff --git a/data/collision/red_stage_top_0.collision b/data/collision/maps/red_stage_top_0.collision
index c07ab31..c07ab31 100755
--- a/data/collision/red_stage_top_0.collision
+++ b/data/collision/maps/red_stage_top_0.collision
Binary files differ
diff --git a/data/collision/red_stage_top_1.collision b/data/collision/maps/red_stage_top_1.collision
index d4424f0..d4424f0 100755
--- a/data/collision/red_stage_top_1.collision
+++ b/data/collision/maps/red_stage_top_1.collision
Binary files differ
diff --git a/data/collision/red_stage_top_2.collision b/data/collision/maps/red_stage_top_2.collision
index 4d09392..4d09392 100755
--- a/data/collision/red_stage_top_2.collision
+++ b/data/collision/maps/red_stage_top_2.collision
Binary files differ
diff --git a/data/collision/red_stage_top_3.collision b/data/collision/maps/red_stage_top_3.collision
index 8e9178f..8e9178f 100755
--- a/data/collision/red_stage_top_3.collision
+++ b/data/collision/maps/red_stage_top_3.collision
Binary files differ
diff --git a/data/collision/red_stage_top_4.collision b/data/collision/maps/red_stage_top_4.collision
index a10543d..a10543d 100755
--- a/data/collision/red_stage_top_4.collision
+++ b/data/collision/maps/red_stage_top_4.collision
Binary files differ
diff --git a/data/collision/red_stage_top_5.collision b/data/collision/maps/red_stage_top_5.collision
index c90aba7..c90aba7 100755
--- a/data/collision/red_stage_top_5.collision
+++ b/data/collision/maps/red_stage_top_5.collision
Binary files differ
diff --git a/data/collision/red_stage_top_6.collision b/data/collision/maps/red_stage_top_6.collision
index e079969..e079969 100755
--- a/data/collision/red_stage_top_6.collision
+++ b/data/collision/maps/red_stage_top_6.collision
Binary files differ
diff --git a/data/collision/red_stage_top_7.collision b/data/collision/maps/red_stage_top_7.collision
index 51f1bc9..51f1bc9 100755
--- a/data/collision/red_stage_top_7.collision
+++ b/data/collision/maps/red_stage_top_7.collision
Binary files differ
diff --git a/data/collision/seel_bonus.collision b/data/collision/maps/seel_bonus.collision
index 03f57b8..03f57b8 100755
--- a/data/collision/seel_bonus.collision
+++ b/data/collision/maps/seel_bonus.collision
Binary files differ
diff --git a/data/collision/seel_bonus_ball_entrance.collision b/data/collision/maps/seel_bonus_ball_entrance.collision
index 4c155fc..4c155fc 100755
--- a/data/collision/seel_bonus_ball_entrance.collision
+++ b/data/collision/maps/seel_bonus_ball_entrance.collision
Binary files differ
diff --git a/data/collision/masks/blue_stage_bottom.masks b/data/collision/masks/blue_stage_bottom.masks
new file mode 100755
index 0000000..a8c935e
--- /dev/null
+++ b/data/collision/masks/blue_stage_bottom.masks
Binary files differ
diff --git a/data/collision/masks/blue_stage_top.masks b/data/collision/masks/blue_stage_top.masks
new file mode 100755
index 0000000..ecb2e27
--- /dev/null
+++ b/data/collision/masks/blue_stage_top.masks
Binary files differ
diff --git a/data/collision/masks/diglett_bonus.masks b/data/collision/masks/diglett_bonus.masks
new file mode 100755
index 0000000..a76b978
--- /dev/null
+++ b/data/collision/masks/diglett_bonus.masks
Binary files differ
diff --git a/data/collision/masks/gengar_bonus.masks b/data/collision/masks/gengar_bonus.masks
new file mode 100755
index 0000000..f95cba5
--- /dev/null
+++ b/data/collision/masks/gengar_bonus.masks
Binary files differ
diff --git a/data/collision/masks/meowth_bonus.masks b/data/collision/masks/meowth_bonus.masks
new file mode 100755
index 0000000..c1626d9
--- /dev/null
+++ b/data/collision/masks/meowth_bonus.masks
Binary files differ
diff --git a/data/collision/masks/mewtwo_bonus.masks b/data/collision/masks/mewtwo_bonus.masks
new file mode 100755
index 0000000..05a497c
--- /dev/null
+++ b/data/collision/masks/mewtwo_bonus.masks
Binary files differ
diff --git a/data/collision/masks/red_stage_bottom.masks b/data/collision/masks/red_stage_bottom.masks
new file mode 100755
index 0000000..49d6d0d
--- /dev/null
+++ b/data/collision/masks/red_stage_bottom.masks
Binary files differ
diff --git a/data/collision/masks/red_stage_top_0.masks b/data/collision/masks/red_stage_top_0.masks
new file mode 100755
index 0000000..dc4fcbd
--- /dev/null
+++ b/data/collision/masks/red_stage_top_0.masks
Binary files differ
diff --git a/data/collision/masks/red_stage_top_1.masks b/data/collision/masks/red_stage_top_1.masks
new file mode 100755
index 0000000..945817f
--- /dev/null
+++ b/data/collision/masks/red_stage_top_1.masks
Binary files differ
diff --git a/data/collision/masks/red_stage_top_2.masks b/data/collision/masks/red_stage_top_2.masks
new file mode 100755
index 0000000..b53cd74
--- /dev/null
+++ b/data/collision/masks/red_stage_top_2.masks
Binary files differ
diff --git a/data/collision/masks/red_stage_top_3.masks b/data/collision/masks/red_stage_top_3.masks
new file mode 100755
index 0000000..4b285f1
--- /dev/null
+++ b/data/collision/masks/red_stage_top_3.masks
Binary files differ
diff --git a/data/collision/masks/seel_bonus.masks b/data/collision/masks/seel_bonus.masks
new file mode 100755
index 0000000..c1626d9
--- /dev/null
+++ b/data/collision/masks/seel_bonus.masks
Binary files differ