summaryrefslogtreecommitdiff
path: root/src/koopatlas
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/koopatlas/core.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp
index f0a57af..f130359 100644
--- a/src/koopatlas/core.cpp
+++ b/src/koopatlas/core.cpp
@@ -142,15 +142,9 @@ bool WMInit_LoadSIAnims(void *ptr) {
DVD_LoadFile(GetDVDClass(), "WorldMap", "SI_penguin", 0);
DVD_LoadFile(GetDVDClass(), "WorldMap", "SI_propeller", 0);
DVD_LoadFile(GetDVDClass(), "WorldMap", "SI_star", 0);
- DVD_LoadFile(GetDVDClass(), "Object", "I_hammer", 0);
+ DVD_LoadFile(GetDVDClass(), "Maps", "SI_hammer", 0);
+
DVD_LoadFile(GetDVDClass(), "Object", "cobCourse", 0);
- DVD_LoadFile(GetDVDClass(), "Object", "obj_coin", 0);
- DVD_LoadFile(GetDVDClass(), "Object", "I_kinoko", 0);
- DVD_LoadFile(GetDVDClass(), "Object", "I_fireflower", 0);
- DVD_LoadFile(GetDVDClass(), "Object", "I_iceflower", 0);
- DVD_LoadFile(GetDVDClass(), "Object", "I_penguin", 0);
- DVD_LoadFile(GetDVDClass(), "Object", "I_propeller", 0);
- DVD_LoadFile(GetDVDClass(), "Object", "I_star", 0);
DVD_LoadFile(GetDVDClass(), "Object", "I_kinoko_bundle", 0);
DVD_LoadFile(GetDVDClass(), "Object", "lakitu", 0);
DVD_LoadFile(GetDVDClass(), "Object", "star_coin", 0);
@@ -241,7 +235,7 @@ bool WMInit_SetupExtra(void *ptr) {
// next: items for the Powerup screen
for (int i = 0; i < 8; i++) {
- void *obj = CreateChildObject(WM_ITEM, wm, i==7?6:i, 0, 0);
+ void *obj = CreateChildObject(WM_ITEM, wm, i, 0, 0);
wm->stockItem->newItemPtr[i] = obj;
}
@@ -437,6 +431,12 @@ int dScKoopatlas_c::onDelete() {
DVD_FreeFile(GetDVDClass2(), "SI_penguin");
DVD_FreeFile(GetDVDClass2(), "SI_propeller");
DVD_FreeFile(GetDVDClass2(), "SI_star");
+ DVD_FreeFile(GetDVDClass2(), "SI_hammer");
+
+ DVD_FreeFile(GetDVDClass2(), "cobCourse");
+ DVD_FreeFile(GetDVDClass2(), "I_kinoko_bundle");
+ DVD_FreeFile(GetDVDClass2(), "lakitu");
+ DVD_FreeFile(GetDVDClass2(), "star_coin");
mapListLoader.unload();