github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 14:23:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Players can now spam their way through Kaepora Gaebora dialogue

Browse source
This commit is contained in:
earthcrafterman 2022-05-04 04:28:21 -04:00
commit 04d42342a7
2 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
soh/soh/z_message_OTR.cpp
View file

@ -20,13 +20,35 @@ MessageTableEntry* OTRMessage_LoadTable(const char* filePath, bool isNES) {
return nullptr; return nullptr;
MessageTableEntry* table = (MessageTableEntry*)malloc(sizeof(MessageTableEntry) * file->messages.size()); MessageTableEntry* table = (MessageTableEntry*)malloc(sizeof(MessageTableEntry) * file->messages.size());
char* kaeporaPatch;
for (int i = 0; i < file->messages.size(); i++) {
if (file->messages[i].id == 0x2066) {
kaeporaPatch = (char*)malloc(sizeof(char) * file->messages[i].msg.size());
kaeporaPatch = (char*)file->messages[i].msg.c_str();
kaeporaPatch[26] = 'Y';
kaeporaPatch[27] = 'e';
kaeporaPatch[28] = 's';
kaeporaPatch[29] = 1;
kaeporaPatch[30] = 'N';
kaeporaPatch[31] = 'o';
break;
}
}
for (int i = 0; i < file->messages.size(); i++) { for (int i = 0; i < file->messages.size(); i++) {
table[i].textId = file->messages[i].id; table[i].textId = file->messages[i].id;
table[i].typePos = (file->messages[i].textboxType << 4) | file->messages[i].textboxYPos; table[i].typePos = (file->messages[i].textboxType << 4) | file->messages[i].textboxYPos;
table[i].segment = file->messages[i].msg.c_str();
table[i].msgSize = file->messages[i].msg.size(); table[i].msgSize = file->messages[i].msg.size();
if (kaeporaPatch != "" && (file->messages[i].id == 0x2066 || file->messages[i].id == 0x607B ||
file->messages[i].id == 0x10C2 || file->messages[i].id == 0x10C6 || file->messages[i].id == 0x206A)) {
table[i].segment = kaeporaPatch;
} else {
table[i].segment = file->messages[i].msg.c_str();
}
if (isNES && file->messages[i].id == 0xFFFC) if (isNES && file->messages[i].id == 0xFFFC)
_message_0xFFFC_nes = (char*)file->messages[i].msg.c_str(); _message_0xFFFC_nes = (char*)file->messages[i].msg.c_str();
} }

4
soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c
View file

@ -61,8 +61,8 @@ typedef enum {
} EnOwlType; } EnOwlType;
typedef enum { typedef enum {
/* 0x00 */ OWL_REPEAT, /* 0x00 */ OWL_OK,
/* 0x01 */ OWL_OK /* 0x01 */ OWL_REPEAT
} EnOwlMessageChoice; } EnOwlMessageChoice;
const ActorInit En_Owl_InitVars = { const ActorInit En_Owl_InitVars = {