summaryrefslogtreecommitdiff
path: root/src/worldmap.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/worldmap.cpp')
-rw-r--r--src/worldmap.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index 50e82c7..06229e0 100644
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -413,7 +413,11 @@ int dScNewerWorldMap_c::onExecute() {
if (nowPressed & WPAD_ONE) {
STKI_SHOW(this->stockItem) = true;
this->state = STATE_POWERUPS_WAIT;
+ } else if (nowPressed & WPAD_PLUS) {
+ CSMENU_ACTIVE(this->csMenu) = true;
+ this->state = STATE_CSMENU;
}
+
} break;
/**********************************************************************/
@@ -815,9 +819,6 @@ void NewerMapDrawFunc() {
// Todo: Newer-specific scenes?
// Stage 1
- SetupLYTDrawing();
- DrawAllLayoutsBeforeX(129);
- GXDrawDone(); // is all GXDrawDone really needed..?
// Stage 2
Reset3DState();
@@ -838,7 +839,9 @@ void NewerMapDrawFunc() {
// Stage 3
Reset3DState();
SetupLYTDrawing();
- DrawAllLayoutsAfterXandBeforeY(128, 146);
+ DrawAllLayoutsBeforeX(146);
+ //DrawAllLayoutsBeforeX(129);
+ //DrawAllLayoutsAfterXandBeforeY(128, 146);
GXDrawDone();
// Stage 4