diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-11-25 15:35:13 -0600 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-11-25 15:35:13 -0600 |
| commit | db34c0af338b8cf04f50b4ade98668869fd303e1 (patch) | |
| tree | e373abe027205c0e8414cf6146ded59112b0ab72 /src/topman.cpp | |
| parent | 72b9b71b5b7fb5757849d19af3dfae21d0ab9c92 (diff) | |
| parent | 1609b49c5c1777e663909b1936b2f8921677f230 (diff) | |
| download | kamek-db34c0af338b8cf04f50b4ade98668869fd303e1.tar.gz kamek-db34c0af338b8cf04f50b4ade98668869fd303e1.zip | |
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to '')
| -rw-r--r-- | src/topman.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/topman.cpp b/src/topman.cpp index 5a313ae..56493da 100644 --- a/src/topman.cpp +++ b/src/topman.cpp @@ -349,7 +349,7 @@ int daTopman::onCreate() { // These structs tell stupid collider what to collide with - these are from koopa troopa static const u8 one[16] = {0,0,0,1, 0,0,0xC0,0, 0,0,0x40,0, 0,0,0,0}; static const u8 two[12] = {0,0,0,0, 0,0,0,0, 0,0,0xC0,0}; - static const u8 three[16] = {0,0,0,1, 0,0,0x60,0, 0,0,0x90,0, 0,0,0x60,0}; + static const u8 three[16] = {0,0,0,1, 0,0,0x60,0, 0,0,0x90,0, 0,0,0xE0,0}; collMgr.Init(this, one, two, three); collMgr.execute(); |