From aa5379a8e0fabd70cac25916a57490424fb803bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20Dub=C3=A9?=
 <159546+serprex@users.noreply.github.com>
Date: Mon, 20 Apr 2026 17:18:25 +0000
Subject: [PATCH] remove 3drando/custom_messages (#6538)

---
 .../randomizer/3drando/custom_messages.cpp    | 80 -------------------
 .../randomizer/3drando/custom_messages.hpp    | 33 --------
 .../randomizer/3drando/hint_list.cpp          |  9 +--
 3 files changed, 3 insertions(+), 119 deletions(-)
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp
 delete mode 100644 soh/soh/Enhancements/randomizer/3drando/custom_messages.hpp

diff --git a/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp b/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp
deleted file mode 100644
index cec16a468..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-#include "custom_messages.hpp"
-#include "../../custom-message/CustomMessageManager.h"
-#include "z64item.h"
-
-namespace CustomMessages {
-using namespace std::literals::string_literals;
-
-std::string MESSAGE_END() {
-    return "\x7F\x00"s;
-}
-std::string WAIT_FOR_INPUT() {
-    return "\x7F\x01"s;
-}
-std::string HORIZONTAL_SPACE(uint8_t x) {
-    return "\x7F\x02"s + char(x);
-}
-std::string GO_TO(uint16_t x) {
-    return "\x7F\x03"s + char(x >> 8) + char(x & 0x00FF);
-}
-std::string INSTANT_TEXT_ON() {
-    return "\x7F\x04"s;
-}
-std::string INSTANT_TEXT_OFF() {
-    return "\x7F\x05"s;
-}
-std::string SHOP_MESSAGE_BOX() {
-    return "\x7F\x06\x00"s;
-}
-std::string EVENT_TRIGGER() {
-    return "\x7F\x07"s;
-}
-std::string DELAY_FRAMES(uint8_t x) {
-    return "\x7F\x08"s + char(x);
-}
-std::string CLOSE_AFTER(uint8_t x) {
-    return "\x7F\x0A"s + char(x);
-}
-std::string PLAYER_NAME() {
-    return "\x7F\x0B"s;
-}
-std::string PLAY_OCARINA() {
-    return "\x7F\x0C"s;
-}
-std::string ITEM_OBTAINED(uint8_t x) {
-    return "\x7F\x0F"s + char(x);
-}
-std::string SET_SPEED(uint8_t x) {
-    return "\x7F\x10"s + char(x);
-}
-std::string SKULLTULAS_DESTROYED() {
-    return "\x7F\x15"s;
-}
-std::string CURRENT_TIME() {
-    return "\x7F\x17"s;
-}
-std::string UNSKIPPABLE() {
-    return "\x7F\x19"s;
-}
-std::string TWO_WAY_CHOICE() {
-    return "\x1B"s;
-}
-std::string NEWLINE() {
-    return "\x7F\x1C"s;
-}
-std::string COLOR(std::string x) {
-    return "\x7F\x1D"s + x;
-}
-std::string CENTER_TEXT() {
-    return "\x7F\x1E"s;
-}
-std::string IF_NOT_MQ() {
-    return "\x7F\x29"s;
-}
-std::string MQ_ELSE() {
-    return "\x7F\x2A"s;
-}
-std::string MQ_END() {
-    return "\x7F\x2B"s;
-}
-} // namespace CustomMessages
diff --git a/soh/soh/Enhancements/randomizer/3drando/custom_messages.hpp b/soh/soh/Enhancements/randomizer/3drando/custom_messages.hpp
deleted file mode 100644
index 71a0e66b0..000000000
--- a/soh/soh/Enhancements/randomizer/3drando/custom_messages.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include <string>
-#include <cstdint>
-
-#include "text.hpp"
-
-namespace CustomMessages {
-std::string MESSAGE_END();
-std::string WAIT_FOR_INPUT();
-std::string HORIZONTAL_SPACE(uint8_t x);
-std::string GO_TO(uint16_t x);
-std::string INSTANT_TEXT_ON();
-std::string INSTANT_TEXT_OFF();
-std::string SHOP_MESSAGE_BOX();
-std::string EVENT_TRIGGER();
-std::string DELAY_FRAMES(uint8_t x);
-std::string CLOSE_AFTER(uint8_t x);
-std::string PLAYER_NAME();
-std::string PLAY_OCARINA();
-std::string ITEM_OBTAINED(uint8_t x);
-std::string SET_SPEED(uint8_t x);
-std::string SKULLTULAS_DESTROYED();
-std::string CURRENT_TIME();
-std::string UNSKIPPABLE();
-std::string TWO_WAY_CHOICE();
-std::string NEWLINE();
-std::string COLOR(std::string x);
-std::string CENTER_TEXT();
-std::string IF_NOT_MQ();
-std::string MQ_ELSE();
-std::string MQ_END();
-} // namespace CustomMessages
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index 98eebc206..1de733662 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -1,10 +1,7 @@
-#include "custom_messages.hpp"
-
 #include "../randomizerTypes.h"
 #include "../SeedContext.h"
 #include "../static_data.h"
 
-using namespace CustomMessages;
 using namespace std::literals::string_literals;
 
 // Big thanks to Lioncache, Gabyelnuevo, Danius88, and Charade for their translations!
@@ -2280,9 +2277,9 @@ void StaticData::HintTable_Init() {
     |    Static Entrance Hint   |
     ---------------------------*/
 
-    hintTextTable[RHT_WARP_SONG] = HintText(CustomMessage("Warp to&#[[1]]#?&" + TWO_WAY_CHOICE() + "#OK&No#",
-                                               /*german*/ "Das Ziel liegt&#[[1]]#!&" + TWO_WAY_CHOICE() + "#Ja!&Nein!#",
-                                               /*french*/ "Se téléporter vers&#[[1]]#?&" + TWO_WAY_CHOICE() + "#OK!&Non#",
+    hintTextTable[RHT_WARP_SONG] = HintText(CustomMessage("Warp to&#[[1]]#?&" + CustomMessage::TWO_WAY_CHOICE() + "#OK&No#",
+                                               /*german*/ "Das Ziel liegt&#[[1]]#!&" + CustomMessage::TWO_WAY_CHOICE() + "#Ja!&Nein!#",
+                                               /*french*/ "Se téléporter vers&#[[1]]#?&" + CustomMessage::TWO_WAY_CHOICE() + "#OK!&Non#",
                                                           {QM_RED, QM_GREEN}));
 
    /*--------------------------