No idea, but some changes...?

4 files changed, 62 insertions, 39 deletions

diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp
index 6378a27..7435103 100644
--- a/src/koopatlas/core.cpp
+++ b/src/koopatlas/core.cpp
@@ -469,37 +469,39 @@ void dScKoopatlas_c::executeState_Normal() {
 	} else if (nowPressed & WPAD_PLUS) {
 		CSMENU_ACTIVE(this->csMenu) = true;
 		state.setState(&StateID_CSMenu);
-	} else if (nowPressed & WPAD_A) {
-
-   		if (pathManager.currentNode->type == dKPNode_s::LEVEL) {
-   			int w = pathManager.currentNode->levelNumber[0];
-			if (w == 9) {
-	   			int l = pathManager.currentNode->levelNumber[1];
-
-				if      ((l < 6)  || (l == 33) || (l == 34))
-					coins->LoadCoinsForWorld(9);
-				else if ((l < 11) || (l == 35) || (l == 36))
-					coins->LoadCoinsForWorld(10);
-				else if ((l < 16) || (l == 37) || (l == 38) || (l == 31) )
-					coins->LoadCoinsForWorld(11);
-				else if ((l < 19) || (l == 39) || (l == 40))
-					coins->LoadCoinsForWorld(12);
-				else
-					coins->LoadCoinsForWorld(13);
-
-				state.setState(&StateID_CoinsWait);
-			}
-			else {
-				coins->LoadCoinsForWorld(w-1);
-				state.setState(&StateID_CoinsWait);
-			}
-		}
-		else {
-			MapSoundPlayer(SoundRelatedClass, SE_SYS_INVALID, 1);
-		}
-
-	} else if (nowPressed & WPAD_B) {
+	// } else if (nowPressed & WPAD_A) {
+
+  //  		if (pathManager.currentNode->type == dKPNode_s::LEVEL) {
+  //  			int w = pathManager.currentNode->levelNumber[0];
+		// 	if (w == 9) {
+	 //   			int l = pathManager.currentNode->levelNumber[1];
+
+		// 		if      ((l < 6)  || (l == 33) || (l == 34))
+		// 			coins->LoadCoinsForWorld(9);
+		// 		else if ((l < 11) || (l == 35) || (l == 36))
+		// 			coins->LoadCoinsForWorld(10);
+		// 		else if ((l < 16) || (l == 37) || (l == 38) || (l == 31) )
+		// 			coins->LoadCoinsForWorld(11);
+		// 		else if ((l < 19) || (l == 39) || (l == 40))
+		// 			coins->LoadCoinsForWorld(12);
+		// 		else
+		// 			coins->LoadCoinsForWorld(13);
+
+		// 		state.setState(&StateID_CoinsWait);
+		// 	}
+		// 	else {
+		// 		coins->LoadCoinsForWorld(w-1);
+		// 		state.setState(&StateID_CoinsWait);
+		// 	}
+		// }
+		// else {
+		// 	MapSoundPlayer(SoundRelatedClass, SE_SYS_INVALID, 1);
+		// }
+
+	} else if (nowPressed & WPAD_MINUS) {
 		pathManager.unlockAllPaths(2);
+	} else if (nowPressed & WPAD_A) {
+		pathManager.unlockAllPaths(0);
 	} 
 
 	pathManager.execute();
@@ -518,9 +520,30 @@ void dScKoopatlas_c::executeState_CSMenu() {
 			switch (CSMENU_CURRENT(this->csMenu)) {
 				case 0:
 					// Star Coins
-					MapReport("Star Coins was pressed\n");
-					coins->LoadCoinsForWorld(save->current_world);
-					state.setState(&StateID_CoinsWait);
+			   		if (pathManager.currentNode->type == dKPNode_s::LEVEL) {
+			   			int w = pathManager.currentNode->levelNumber[0];
+						if (w == 9) {
+				   			int l = pathManager.currentNode->levelNumber[1];
+
+							if      ((l < 6)  || (l == 33) || (l == 34))
+								coins->LoadCoinsForWorld(9);
+							else if ((l < 11) || (l == 35) || (l == 36))
+								coins->LoadCoinsForWorld(10);
+							else if ((l < 16) || (l == 37) || (l == 38) || (l == 31) )
+								coins->LoadCoinsForWorld(11);
+							else if ((l < 19) || (l == 39) || (l == 40))
+								coins->LoadCoinsForWorld(12);
+							else
+								coins->LoadCoinsForWorld(13);
+
+							state.setState(&StateID_CoinsWait);
+						}
+						else {
+							coins->LoadCoinsForWorld(w-1);
+							state.setState(&StateID_CoinsWait);
+						}
+					}
+					else { MapSoundPlayer(SoundRelatedClass, SE_SYS_INVALID, 1); }
 					break;
 
 				case 1:
diff --git a/src/koopatlas/hud.cpp b/src/koopatlas/hud.cpp
index df4bb1e..8f4b778 100644
--- a/src/koopatlas/hud.cpp
+++ b/src/koopatlas/hud.cpp
@@ -433,13 +433,13 @@ void dWMHud_c::setWorldName() {
 				break;	
 
 			case 10:		
-				if      ((level < 6)  || (level == 33) || (level == 34))
+				if      ((level < 6)  || (level == 30) || (level == 41) )
 					setWorldText("Goldwood\nForest");
-				else if ((level < 11) || (level == 35) || (level == 36))
+				else if ((level < 11) || (level == 32))
 					setWorldText("Mini-Mega\nIsland");
-				else if ((level < 16) || (level == 37) || (level == 38) || (level == 31) )
+				else if ((level < 16) || (level == 33) || (level == 34) || (level == 31) )
 					setWorldText("Crystal\nCaves");
-				else if ((level < 19) || (level == 39) || (level == 40))
+				else if (level < 19)
 					setWorldText("Bombard\nCliffs");
 				else
 					setWorldText("Sky\nCity");
diff --git a/src/koopatlas/mapdata.cpp b/src/koopatlas/mapdata.cpp
index cae2819..ef0a747 100644
--- a/src/koopatlas/mapdata.cpp
+++ b/src/koopatlas/mapdata.cpp
@@ -247,7 +247,7 @@ void dKPMapData_c::fixup() {
 
 					if (node->type == dKPNode_s::CHANGE) {
 						fixRef(node->destMap);
-						OSReport("Node: %x, %s"), node->destMap, node->destMap; }
+						OSReport("Node: %x, %s", node->destMap, node->destMap); }
 
 				}
 				break;
diff --git a/src/koopatlas/pathmanager.cpp b/src/koopatlas/pathmanager.cpp
index a175763..9ecc8d5 100644
--- a/src/koopatlas/pathmanager.cpp
+++ b/src/koopatlas/pathmanager.cpp
@@ -538,7 +538,7 @@ void dWMPathManager_c::activatePoint() {
 		int w = currentNode->levelNumber[0] - 1;
 		int l = currentNode->levelNumber[1] - 1;
 
-		if (l == 0) {
+		if (l == 40) {
 			dWMShop_c::instance->LoadShopForWorld(w);
 			dScKoopatlas_c::instance->state.setState(&dScKoopatlas_c::instance->StateID_ShopWait);
 			return;