Skip to content

Commit

Permalink
Refactors custom message code to its own file
Browse files Browse the repository at this point in the history
  • Loading branch information
leggettc18 committed Jul 14, 2022
1 parent 14a87f8 commit d927753
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 11 deletions.
39 changes: 39 additions & 0 deletions soh/soh/Enhancements/randomizer/custom_messages.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#include "custom_messages.h"
#include <variables.h>

using namespace std::literals::string_literals;

std::string Randomizer::GetCustomGetItemMessage(GetItemID giid) {
if (!gSaveContext.n64ddFlag) {
return "Not Randomized.";
}

switch (giid) {
default:
switch (gSaveContext.language) {
case LANGUAGE_FRA:
return "Il n'y a pas de message personnalisé pour cet élément.";
case LANGUAGE_GER:
return "Für diesen Artikel gibt es keine benutzerdefinierte Nachricht.";
case LANGUAGE_ENG:
default:
return "There is no custom message for this item.";
}
}
}

std::string MESSAGE_END() {
return "\x02"s;
}

std::string ITEM_OBTAINED(uint8_t x) {
return "\x08\x13"s + char(x);
}

std::string NEWLINE() {
return "\x02"s;
}

std::string COLOR(uint8_t x) {
return "\x05"s + char(x);
}
19 changes: 19 additions & 0 deletions soh/soh/Enhancements/randomizer/custom_messages.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#pragma once

#include <string>
#include "../../../include/z64item.h"
#include "randomizer.h"

#define QM_WHITE 0x00
#define QM_RED 0x41
#define QM_GREEN 0x42
#define QM_BLUE 0x43
#define QM_LBLUE 0x44
#define QM_PINK 0x45
#define QM_YELLOW 0x46
#define QM_BLACK 0x47

std::string MESSAGE_END();
std::string ITEM_OBTAINED(uint8_t x);
std::string NEWLINE();
std::string COLOR(uint8_t x);
11 changes: 0 additions & 11 deletions soh/soh/Enhancements/randomizer/randomizer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2419,17 +2419,6 @@ GetItemID Randomizer::GetRandomizedItemIdFromKnownCheck(RandomizerCheck randomiz
return GetItemFromGet(this->itemLocations[randomizerCheck], ogId);
}

std::string Randomizer::GetCustomGetItemMessage(GetItemID giid) {
if (!gSaveContext.n64ddFlag) {
return "Not Randomized.";
}

switch (giid) {
default:
"There is no custom message for this item.";
}
}

RandomizerCheck Randomizer::GetCheckFromActor(s16 sceneNum, s16 actorId, s16 actorParams) {
if (!gSaveContext.n64ddFlag) {
return RC_UNKNOWN_CHECK;
Expand Down

0 comments on commit d927753

Please sign in to comment.