From 3c4405347d4b7e52d5cf8a91d08ce8d10e39f59c Mon Sep 17 00:00:00 2001
From: Sarge-117 <adam_branston@outlook.com>
Date: Tue, 9 Aug 2022 18:35:39 -0700
Subject: [PATCH] Remove old stuff + add test messages

---
 soh/CMakeLists.txt                            |  1 -
 .../Enhancements/randomizer/randomizer.cpp    | 25 ++++++++++++++++---
 soh/soh/OTRGlobals.cpp                        |  2 +-
 soh/src/code/z_message_PAL.c                  |  7 ------
 .../actors/ovl_player_actor/z_player.c        |  4 ---
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt
index 85fd7f080..5342374f0 100644
--- a/soh/CMakeLists.txt
+++ b/soh/CMakeLists.txt
@@ -485,7 +485,6 @@ set(Source_Files__src__code
     "src/code/z_map_exp.c"
     "src/code/z_map_mark.c"
     "src/code/z_message_PAL.c"
-    "src/code/z_message_RandoNaviTips.c"
     "src/code/z_moji.c"
     "src/code/z_msgevent.c"
     "src/code/z_olib.c"
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 0c6a7530a..7eea3f788 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -4419,13 +4419,16 @@ void CreateScrubMessages() {
     }
 }
 
+CustomMessageMinimal NaviMessages[];
+
 void CreateNaviRandoMessages() {
     CustomMessageManager* customMessageManager = CustomMessageManager::Instance;
     customMessageManager->AddCustomMessageTable(Randomizer::NaviRandoMessageTableID);
-    customMessageManager->CreateMessage(Randomizer::NaviRandoMessageTableID, 0x00,
-                                        { TEXTBOX_TYPE_BLACK, TEXTBOX_POS_BOTTOM, "Test Eng0", "Test Ger", "Test Fre" });
-    customMessageManager->CreateMessage(Randomizer::NaviRandoMessageTableID, 0x01,
-                                        { TEXTBOX_TYPE_BLACK, TEXTBOX_POS_BOTTOM, "Test Eng1", "Test Ger", "Test Fre" });
+    for (int i = 0; i <= 3; i++) {
+        customMessageManager->CreateMessage(Randomizer::NaviRandoMessageTableID, i,
+                                            { TEXTBOX_TYPE_BLACK, TEXTBOX_POS_BOTTOM, NaviMessages[i].english,
+                                              NaviMessages[i].german, NaviMessages[i].french });
+    }
 }
 
 void Randomizer::CreateCustomMessages() {
@@ -4471,3 +4474,17 @@ void Rando_Init(void) {
 }
 
 }
+
+CustomMessageMinimal NaviMessages[3] = { { "%cMissing a small key in a dungeon?&Maybe the %rboss %chas it!", 
+                                           "%cGerman tip about playing rando! 0", 
+                                           "%cFrench tip about playing rando! 0" }, 
+
+                                         { "%cSometimes you can use the %rMegaton &Hammer %cinstead of bombs!", 
+                                           "%cGerman tip about playing rando! 1",
+                                           "%cFrench tip about playing rando! 1" }, 
+
+                                         { "%cThere are three %gbusiness scrubs %cin &Hyrule who sell %wmysterious items%c. Do &you know where they are?",
+                                           "%cGerman tip about playing rando! 2",
+                                           "%cFrench tip about playing rando! 2" }
+
+};
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 8630e0dcc..d79ab84d9 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -1450,7 +1450,7 @@ extern "C" CustomMessageEntry Randomizer_GetScrubMessage(u16 scrubTextId) {
 }
 
 extern "C" CustomMessageEntry Randomizer_GetNaviMessage() {
-    u16 naviTextId = rand() % 2;
+    u16 naviTextId = rand() % 3;
     return CustomMessageManager::Instance->RetrieveMessage(Randomizer::NaviRandoMessageTableID, naviTextId);
 }
 
diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c
index 430a7e3fa..11c59db8b 100644
--- a/soh/src/code/z_message_PAL.c
+++ b/soh/src/code/z_message_PAL.c
@@ -1682,13 +1682,6 @@ void Message_OpenText(GlobalContext* globalCtx, u16 textId) {
         memcpy(font->msgBuf, src, font->msgLength);
     }
 
-    /*
-    // (From z_player.c) In rando, Navi gives rando-related advice
-    if (textId == 0x0140 && gSaveContext.n64ddFlag) {
-        RandoNaviTip(globalCtx);
-        msgCtx->msgLength = font->msgLength = strlen(font->msgBuf);
-    }*/
-
     msgCtx->textBoxProperties = font->charTexBuf[0];
     msgCtx->textBoxType = msgCtx->textBoxProperties >> 4;
     msgCtx->textBoxPos = msgCtx->textBoxProperties & 0xF;
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index 0694deb90..eac49315d 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -15292,9 +15292,5 @@ void func_80853148(GlobalContext* globalCtx, Actor* actor) {
     if ((this->naviActor == this->targetActor) && ((this->targetActor->textId & 0xFF00) != 0x200)) {
         this->naviActor->flags |= ACTOR_FLAG_8;
         func_80835EA4(globalCtx, 0xB);
-        // If rando'd and Navi wants to give you a general quest tip, give a rando tip instead
-  //      if (actor->textId >= 0x0140 && actor->textId <= 0x015F && gSaveContext.n64ddFlag) {
-  //          Message_StartTextbox(globalCtx, 0x0140, NULL);
-  //      }
     }
 }