mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-12 05:27:48 -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/enemy/businessScrub.c
+13 -13
View File
@@ -250,7 +250,7 @@ void sub_08028CE8(Entity* this) {
if (offer->price <= gSave.stats.rupees) {
if (sub_080291DC(this)) {
/* Bag full. */
MessageFromTarget(0x2904);
MessageFromTarget(TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x04));
SetPlayerControl(0);
} else {
ModRupees(-offer->price);
@@ -285,7 +285,7 @@ void sub_08028CE8(Entity* this) {
}
} else {
/* Not enough money. */
MessageFromTarget(0x2903);
MessageFromTarget(TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x03));
SetPlayerControl(0);
}
}
@@ -303,7 +303,7 @@ void sub_08028DE8(Entity* this) {
this->field_0x80.HALF.HI = 1;
}
} else {
MessageFromTarget(0x2902);
MessageFromTarget(TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x02));
this->action = 4;
this->field_0x80.HALF.HI = 0;
this->timer = 1;
@@ -561,18 +561,18 @@ void sub_08029270(Entity* this) {
// clang-format off
const struct SalesOffering gUnk_080CC954[] = {
{0x06, 0x00, 0xffff, 0x290f, 0x2902, 0x09, 0xff, 0x0001},
{0x04, 0x00, 0x001e, 0x290e, 0x2902, 0x6f, 0xff, 0xffff},
{0x04, 0x00, 0x001e, 0x290b, 0x2902, 0x6c, 0xff, 0xffff},
{0x08, 0x00, 0x0028, 0x290c, 0x2911, 0x44, 0xff, 0xffff},
{0x00, 0x00, 0x0064, 0x290d, 0x2902, 0x5c, 0xff, 0xffff},
{0x04, 0x00, 0x0014, 0x2910, 0x2911, 0x1c, 0xff, 0xffff},
{0x0c, 0x00, 0xffff, 0x2912, 0x2913, 0xff, 0xff, 0x0046},
{0x04, 0x00, 0x0064, 0x2913, 0x2902, 0x5c, 0x75, 0xffff},
{0x06, 0x00, 0xffff, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x0f), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x02), 0x09, 0xff, 0x0001},
{0x04, 0x00, 0x001e, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x0e), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x02), 0x6f, 0xff, 0xffff},
{0x04, 0x00, 0x001e, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x0b), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x02), 0x6c, 0xff, 0xffff},
{0x08, 0x00, 0x0028, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x0c), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x11), 0x44, 0xff, 0xffff},
{0x00, 0x00, 0x0064, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x0d), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x02), 0x5c, 0xff, 0xffff},
{0x04, 0x00, 0x0014, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x10), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x11), 0x1c, 0xff, 0xffff},
{0x0c, 0x00, 0xffff, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x12), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x13), 0xff, 0xff, 0x0046},
{0x04, 0x00, 0x0064, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x13), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x02), 0x5c, 0x75, 0xffff},
#ifdef EU
{0x00, 0x00, 0x0064, 0x290d, 0x2902, 0x5c, 0xff, 0xffff},
{0x00, 0x00, 0x0064, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x0d), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x02), 0x5c, 0xff, 0xffff},
#else
{0x00, 0x00, 0x00C8, 0x290d, 0x2902, 0x5c, 0xff, 0xffff},
{0x00, 0x00, 0x00C8, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x0d), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x02), 0x5c, 0xff, 0xffff},
#endif
};
src/enemy/likeLike.c
+3 -3
View File
@@ -234,10 +234,10 @@ void sub_080281A0(Entity* this) {
this->subtimer = 0x19;
if (sub_080281E0(ITEM_MIRROR_SHIELD)) {
this->field_0x80.HALF.LO = ITEM_MIRROR_SHIELD;
MessageFromTarget(0x578);
MessageFromTarget(TEXT_INDEX(TEXT_ITEM_GET, 0x78));
} else if (sub_080281E0(ITEM_SHIELD)) {
this->field_0x80.HALF.LO = ITEM_SHIELD;
MessageFromTarget(0x578);
MessageFromTarget(TEXT_INDEX(TEXT_ITEM_GET, 0x78));
} else {
ModHealth(-1);
}
@@ -269,7 +269,7 @@ void sub_08028224(u32 item) {
#else
InitItemGetSequence(item, 0, 1);
#endif
MessageFromTarget(0x579);
MessageFromTarget(TEXT_INDEX(TEXT_ITEM_GET, 0x79));
}
void (*const LikeLike_Functions[])(Entity*) = {
src/enemy/vaatiWrath.c
+2 -2
View File
@@ -623,7 +623,7 @@ void sub_08041CD0(Entity* this) {
} else {
this->subAction = 2;
this->timer = 0x3c;
MessageFromTarget(0x1651);
MessageFromTarget(TEXT_INDEX(TEXT_VAATI2, 0x51));
}
} else {
UpdateAnimationSingleFrame(this);
@@ -1007,7 +1007,7 @@ void VaatiWrathType0PreAction(Entity* this) {
if (gPlayerState.item == NULL) {
if (gPlayerEntity.field_0x7a.HWORD == 0) {
if ((gPlayerEntity.z.HALF.HI & 0x8000U) == 0 || (gPlayerState.field_0xa != 0)) {
CreateEzloHint(0xb70, 0);
CreateEzloHint(TEXT_INDEX(TEXT_EZLO, 0x70), 0);
gRoomTransition.field_0x38 |= 2;
}
}