mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-04 02:47:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add TextCategory enum

Browse Source
This commit is contained in:
Tal Hayon
2022-04-27 00:01:22 +03:00
parent f899598843
commit 4de453b4de
67 changed files with 1197 additions and 679 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/cuccoMinigame.c
+5 -5
View File
@@ -169,10 +169,10 @@ void CuccoMinigame_Cleanup(ObjectB9Entity* this) {
void sub_080A13B4(ObjectB9Entity* this, ScriptExecutionContext* context) {
if (this->unk6a >= this->unk6c) {
MessageFromTarget(0x300c);
MessageFromTarget(TEXT_INDEX(TEXT_ANJU, 0xc));
context->condition = 1;
} else {
MessageFromTarget(0x3005);
MessageFromTarget(TEXT_INDEX(TEXT_ANJU, 0x5));
context->condition = 0;
}
}
@@ -229,7 +229,7 @@ void sub_080A1460(ObjectB9Entity* this) {
pcVar1++;
}
ModRupees(rupees);
MessageNoOverlap(0x3007, super);
MessageNoOverlap(TEXT_INDEX(TEXT_ANJU, 0x7), super);
gMessage.rupees = (u16)rupees;
}
@@ -329,9 +329,9 @@ void sub_080A1608(void) {
u16 messageIndex;
const u16* ptr;
messageIndex = 0x3002;
messageIndex = TEXT_INDEX(TEXT_ANJU, 0x2);
if (CheckRoomFlag(1)) {
messageIndex = 0x3006;
messageIndex = TEXT_INDEX(TEXT_ANJU, 0x6);
}
MessageFromTarget(messageIndex);
gMessage.textWindowPosX = 1;
src/object/figurineDevice.c
+17 -17
View File
@@ -298,7 +298,7 @@ void FigurineDevice_Action4(FigurineDeviceEntity* this) {
this->unk_7a = 0;
this->unk_7b = 4;
SetRoomFlag(3);
MessageFromTarget(0x431a);
MessageFromTarget(TEXT_INDEX(TEXT_CARLOV, 0x1a));
#ifndef EU
gMessage.textWindowPosX = 1;
gMessage.textWindowPosY = 0xc;
@@ -406,7 +406,7 @@ void sub_080882A8(FigurineDeviceEntity* this) {
206, 79, 3, 2, 0, 208, 0, 6, 0, 13, 0, 2, 0, 0, 0, 0, 128, 240, 208, 139, 2, 0, 1, 0,
};
#endif
static const u16 gUnk_08120AE4[] = { 0x4318, 0x4319 };
static const u16 gUnk_08120AE4[] = { TEXT_INDEX(TEXT_CARLOV, 0x18), TEXT_INDEX(TEXT_CARLOV, 0x19) };
u8* ptr;
sub_08050384();
sub_08057044(this->unk_81, gUnk_020227E8, 0x202020);
@@ -447,26 +447,26 @@ void sub_08088478(void) {
bool32 set0x10 = FALSE;
if (!CheckRoomFlag(8)) {
if (!CheckRoomFlag(7)) {
messageIndex = 0x4322;
messageIndex = TEXT_INDEX(TEXT_CARLOV, 0x22);
set0x10 = TRUE;
} else {
messageIndex = 0x4325;
messageIndex = TEXT_INDEX(TEXT_CARLOV, 0x25);
}
} else {
switch (gSave.stats.filler[0]) {
case 0x88:
gSave.stats.filler[1] = 0xff;
messageIndex = 0x4329;
messageIndex = TEXT_INDEX(TEXT_CARLOV, 0x29);
break;
case 0x82:
if (gSave.saw_staffroll) {
messageIndex = 0x4327;
messageIndex = TEXT_INDEX(TEXT_CARLOV, 0x27);
} else {
messageIndex = 0x4328;
messageIndex = TEXT_INDEX(TEXT_CARLOV, 0x28);
}
break;
default:
messageIndex = 0x4327;
messageIndex = TEXT_INDEX(TEXT_CARLOV, 0x27);
}
}
MessageFromTarget(messageIndex);
@@ -484,13 +484,13 @@ void sub_08088504(void) {
u32 index;
switch (gSave.stats.filler[0]) {
case 0x88:
index = 0x432f;
index = TEXT_INDEX(TEXT_CARLOV, 0x2f);
break;
case 0x82:
index = 0x4314;
index = TEXT_INDEX(TEXT_CARLOV, 0x14);
break;
default:
index = 0x4311;
index = TEXT_INDEX(TEXT_CARLOV, 0x11);
break;
}
MessageFromTarget(index);
@@ -501,9 +501,9 @@ void sub_08088504(void) {
void sub_08088544(void) {
u32 index;
if (gSave.stats.filler[0] != 0x82) {
index = 0x430e;
index = TEXT_INDEX(TEXT_CARLOV, 0xe);
} else {
index = 0x4315;
index = TEXT_INDEX(TEXT_CARLOV, 0x15);
}
MessageFromTarget(index);
gMessage.textWindowPosX = 1;
@@ -518,12 +518,12 @@ void sub_08088574(void) {
if (CheckRoomFlag(9)) {
#endif
if (CheckLocalFlag(SHOP07_COMPLETE)) {
index = 0x4313;
index = TEXT_INDEX(TEXT_CARLOV, 0x13);
} else {
index = 0x430c;
index = TEXT_INDEX(TEXT_CARLOV, 0x0c);
}
} else {
index = 0x430b;
index = TEXT_INDEX(TEXT_CARLOV, 0x0b);
}
MessageFromTarget(index);
gMessage.textWindowPosX = 1;
@@ -534,7 +534,7 @@ void sub_080885B0(void) {
if (!CheckRoomFlag(8)) {
if (!CheckRoomFlag(7)) {
ModRupees(5);
MessageFromTarget(0x4326);
MessageFromTarget(TEXT_INDEX(TEXT_CARLOV, 0x26));
gMessage.textWindowPosX = 1;
gMessage.textWindowPosY = 0xc;
}
src/object/fourElements.c
+2 -2
View File
@@ -20,7 +20,7 @@ typedef struct {
/*0x6a*/ u8 unk_6a;
} FourElementsEntity;
extern u32 sub_0805429C(u32);
extern u32 getItemMetaDataGetTextIndex(u32);
extern void sub_0807DF50(void);
extern u16 script_PlayerGetElement[];
@@ -133,7 +133,7 @@ void FourElements_Action5(FourElementsEntity* this) {
RequestPriorityDuration(NULL, 10);
if (--this->unk_68 == 0) {
super->action = 6;
index = sub_0805429C(super->type);
index = getItemMetaDataGetTextIndex(super->type);
MessageNoOverlap(index, super);
}
}
src/object/frozenOctorok.c
+2 -2
View File
@@ -92,7 +92,7 @@ void FrozenOctorok_Action1SubAction0(FrozenOctorokEntity* this) {
}
}
if (this->unk_79-- == 0) {
MessageFromTarget(0xb43);
MessageFromTarget(TEXT_INDEX(TEXT_EZLO, 0x43));
super->subAction = 1;
this->unk_79 = 8;
}
@@ -238,7 +238,7 @@ void FrozenOctorok_Action1SubAction6(FrozenOctorokEntity* this) {
void FrozenOctorok_Action1SubAction7(FrozenOctorokEntity* this) {
if ((gRoomControls.scroll_flags & 4) == 0) {
CreateEzloHint(0xb44, 0);
CreateEzloHint(TEXT_INDEX(TEXT_EZLO, 0x44), 0);
DeleteThisEntity();
}
}
src/object/object6A.c
+1 -1
View File
@@ -448,7 +448,7 @@ void sub_08095088(Object6AEntity* this) {
super->interactType = 0;
super->action = 2;
sub_080788E0(super);
CreateEzloHint(0x1F1F, 0);
CreateEzloHint(TEXT_INDEX(TEXT_BELARI, 0x1F), 0);
}
break;
case 2:
src/object/objectB.c
+2 -2
View File
@@ -81,7 +81,7 @@ void ObjectB_Action1(ObjectBEntity* this) {
tmp = GetInventoryValue((u32)super->type);
ptr = &gItemMetaData[super->type];
if (tmp == 0) {
this->unk_68 = *(u16*)&ptr->unk4;
this->unk_68 = *(u16*)&ptr->textId;
} else {
this->unk_68 = *(u16*)&ptr->unk6;
}
@@ -114,7 +114,7 @@ void ObjectB_Action2(ObjectBEntity* this) {
break;
case 0x3f:
if (super->type2 > 1) {
if (messageIndex == 0x577) {
if (messageIndex == TEXT_INDEX(TEXT_ITEM_GET, 0x77)) {
messageIndex--;
} else {
messageIndex++;
src/object/swordsmanNewsletter.c
+3 -1
View File
@@ -26,7 +26,9 @@ void sub_080933D8(Entity* this) {
void sub_080933FC(Entity* this) {
static const u16 messageIndices[] = {
0x301, 0x302, 0x303, 0x304, 0x305, 0x306, 0x307, 0x308,
TEXT_INDEX(TEXT_NEWSLETTER, 1), TEXT_INDEX(TEXT_NEWSLETTER, 2), TEXT_INDEX(TEXT_NEWSLETTER, 3),
TEXT_INDEX(TEXT_NEWSLETTER, 4), TEXT_INDEX(TEXT_NEWSLETTER, 5), TEXT_INDEX(TEXT_NEWSLETTER, 6),
TEXT_INDEX(TEXT_NEWSLETTER, 7), TEXT_INDEX(TEXT_NEWSLETTER, 8),
};
if (this->interactType != 0) {
this->interactType = 0;