From dc24f25e769617e1ded10418c94c9be7e431fdf7 Mon Sep 17 00:00:00 2001
From: Llennpie <44985633+Llennpie@users.noreply.github.com>
Date: Fri, 26 Nov 2021 17:43:19 -0500
Subject: [PATCH] Update Jabo Mode, rename window title, minor tweaks

---
 src/moon/achievements/achievements.cpp | 1 +
 src/moon/imgui/imgui_impl.cpp          | 4 ++--
 src/moon/saturn/saturn.cpp             | 3 +--
 src/pc/pc_main.c                       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/moon/achievements/achievements.cpp b/src/moon/achievements/achievements.cpp
index cee14def..6ed33979 100644
--- a/src/moon/achievements/achievements.cpp
+++ b/src/moon/achievements/achievements.cpp
@@ -336,6 +336,7 @@ namespace MoonInternal {
 
 namespace Moon {
     void showAchievement(Achievement* achievement){
+        return; // here at saturn we dont show achievements
         if(cheatsGotEnabled || gCurrDemoInput) return;
 
         if(find_if(entries[gCurrSaveFileNum - 1].begin(), entries[gCurrSaveFileNum - 1].end(),  [&cae = achievement] (auto &m) -> bool { return cae->id == m->achievement->id; }) != entries[gCurrSaveFileNum - 1].end()) return;
diff --git a/src/moon/imgui/imgui_impl.cpp b/src/moon/imgui/imgui_impl.cpp
index ffa4e21a..ca54f60a 100644
--- a/src/moon/imgui/imgui_impl.cpp
+++ b/src/moon/imgui/imgui_impl.cpp
@@ -81,8 +81,8 @@ using namespace std;
 SDL_Window* window = nullptr;
 ImGuiIO* io = nullptr;
 
-#define SM64_WIDTH  1280
-#define SM64_HEIGHT 960
+#define SM64_WIDTH  960
+#define SM64_HEIGHT 720
 
 // Helper to display a little (?) mark which shows a tooltip when hovered.
 static void HelpMarker(const char* desc)
diff --git a/src/moon/saturn/saturn.cpp b/src/moon/saturn/saturn.cpp
index c54c7383..7b915846 100644
--- a/src/moon/saturn/saturn.cpp
+++ b/src/moon/saturn/saturn.cpp
@@ -104,8 +104,7 @@ namespace MoonInternal {
                         }
                     case SDL_CONTROLLERBUTTONDOWN:
                         if (ev->cbutton.button == SDL_CONTROLLER_BUTTON_DPAD_UP) {
-                            if (!show_menu_bar)
-                                freeze_camera();
+                            freeze_camera();
                         }
                         if (ev->cbutton.button == SDL_CONTROLLER_BUTTON_DPAD_RIGHT) {
                             //cycle_eye_state(1);
diff --git a/src/pc/pc_main.c b/src/pc/pc_main.c
index e6fac256..50670c05 100644
--- a/src/pc/pc_main.c
+++ b/src/pc/pc_main.c
@@ -211,7 +211,7 @@ void main_func(char *argv[]) {
     #  define RAPI_NAME "OpenGL"
     # endif
 
-    char window_title[96] = "Saturn";
+    char window_title[96] = "Saturn: Moon Edition";
 
     gfx_init(wm_api, rendering_api, window_title);
     wm_api->set_keyboard_callbacks(keyboard_on_key_down, keyboard_on_key_up, keyboard_on_all_keys_up);