diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-10-03 12:55:15 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-10-03 12:55:15 -0500 |
| commit | 34efbdba59b460a2f565c25a5ff20efb8d1077a0 (patch) | |
| tree | c1729468fd611f9523e3a2bf492363e34c2fb879 /tools/UsedProfileAndSpriteList.txt | |
| parent | c1365802c73376609e53b97440ae037b14f6324f (diff) | |
| parent | 21d8492ded507f8f09bc28919b8d351b86fa0dd0 (diff) | |
| download | kamek-34efbdba59b460a2f565c25a5ff20efb8d1077a0.tar.gz kamek-34efbdba59b460a2f565c25a5ff20efb8d1077a0.zip | |
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to '')
| -rw-r--r-- | tools/UsedProfileAndSpriteList.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/UsedProfileAndSpriteList.txt b/tools/UsedProfileAndSpriteList.txt index 8011339..4f606ed 100644 --- a/tools/UsedProfileAndSpriteList.txt +++ b/tools/UsedProfileAndSpriteList.txt @@ -38,17 +38,18 @@ 250 : KAWANAGARE : Electric Line 251 : SLOW_QUICK_TAG : Topman Boss 273 : WM_KINOBALLOON : Palace Activator +279 : AC_LIFT_ICE_SPRING : Balboa Wrench 282 : EN_WALLINSECT : Mr Sun 283 : WALLINSECT_MGR : Fuzzy Bear 290 : EN_IWAO : Ramboo 302 : EN_GAKE_NOKO : Wrench +319 : WM_GRID : Flip Block 322 : EN_GHOST_JUGEM : Thwomp Boss 324 : SHIP_WINDOW : Podouble 332 : LIFT_TORIDE_ROLL : Effect Video 350 : DUMMY_DOOR_PARENT : Fire Laser 351 : DUMMY_DOOR_CHILD : Shy Guy 410 : AC_BLOCK_GROUP : Mega Goomba -XXX : AC_LIFT_ICE_SPRING : Balboa Wrench @@ -88,6 +89,7 @@ WM_BOSS_IGGY WM_CLOUD WM_DANCE_PAKKUN WM_GHOST +WM_GRID WM_KILLER WM_KILLERBULLET WM_KINOBALLOON @@ -127,7 +129,6 @@ WM_CS_W3_PALM WM_DIRECTOR WM_DOKAN WM_DOKANROUTE -WM_GRID WM_HANACHAN WM_IBARA WM_ISLAND |