diff options
author | Colin Noga <Tempus@chronometry.ca> | 2012-03-29 11:11:11 -0500 |
---|---|---|
committer | Colin Noga <Tempus@chronometry.ca> | 2012-03-29 11:11:11 -0500 |
commit | 2e5153002bccc3722dbacaa62b729493d2c2bf89 (patch) | |
tree | 0d235a689a0d7c831293dff206833f2d8efb277a /NewerProjectKP.yaml | |
parent | 128ab59a90b26c54e18f8823adc26d37115fb5f5 (diff) | |
parent | 7bbab722a388bc63ec195a48c22c7060e3fab999 (diff) | |
download | kamek-2e5153002bccc3722dbacaa62b729493d2c2bf89.tar.gz kamek-2e5153002bccc3722dbacaa62b729493d2c2bf89.zip |
merging changes to latest pull
Diffstat (limited to 'NewerProjectKP.yaml')
-rw-r--r-- | NewerProjectKP.yaml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/NewerProjectKP.yaml b/NewerProjectKP.yaml index 3c9657b..d7d4343 100644 --- a/NewerProjectKP.yaml +++ b/NewerProjectKP.yaml @@ -2,8 +2,8 @@ output_dir: "NewerASM" code_address: 0x808D9000 modules: - processed/prolog.yaml + - processed/magicplatform.yaml - processed/bugfixes.yaml -# - processed/worldmap.yaml - processed/koopatlas.yaml - processed/levelnames.yaml - processed/animtiles.yaml @@ -16,6 +16,7 @@ modules: - processed/poweruphax.yaml # - processed/heapbar.yaml - processed/randtiles.yaml + - processed/objkinoko.yaml - processed/tilegod.yaml - processed/linegod.yaml - processed/tilesetfixer.yaml @@ -37,6 +38,16 @@ modules: - processed/bossRamboo.yaml - processed/bossBalboaWrench.yaml - processed/bossWrenchThrow.yaml + - processed/bossPodouble.yaml + - processed/bossTopman.yaml + - processed/bossCaptainBowser.yaml - processed/effectVideo.yaml - processed/fakeStarCoin.yaml + - processed/shyguy.yaml + - processed/meteor.yaml + - processed/topman.yaml + - processed/electricLine.yaml + - processed/makeYourOwn.yaml + - processed/challengeStar.yaml + # - processed/pengi.yaml # - processed/actorlog.yaml |