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 /tools | |
| 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-- | tools/UsedProfileAndSpriteList.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/UsedProfileAndSpriteList.txt b/tools/UsedProfileAndSpriteList.txt index ef22308..1b4ba12 100644 --- a/tools/UsedProfileAndSpriteList.txt +++ b/tools/UsedProfileAndSpriteList.txt @@ -7,7 +7,6 @@ --- : WM_PLAYER : Player --- : WM_SINKSHIP : Song Prize --- : WM_SMALLCLOUD : Bridge Bowser: Dropped Bomb ---- : WM_SUBPLAYER : SubPlayer --- : WM_TOGEZO : Shop --- : WORLD_CAMERA : World Camera --- : WORLD_MAP : Koopatlas @@ -102,7 +101,6 @@ WM_PUKU WM_PUKU WM_SINKSHIP WM_SMALLCLOUD -WM_SUBPLAYER WM_TOGEZO WORLD_CAMERA WORLD_MAP @@ -148,6 +146,7 @@ WM_PEACH_CASTLE WM_SANDPILLAR WM_START WM_STOP +WM_SUBPLAYER WM_SURRENDER WM_SWITCH WM_TERESA |