Skip to content

Commit 29136b0

Browse files
committed
Update EffWork variables
1 parent 63dd8f4 commit 29136b0

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

ttyd-tools/rel/include/ttyd/effdrv.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ static_assert(sizeof(EffEntry) == 0x28);
1919

2020
struct EffWork
2121
{
22-
uint32_t effCount;
23-
EffEntry *entries;
24-
uint32_t unk_8;
25-
uint32_t unk_c;
26-
uint32_t unk_10;
27-
uint32_t unk_14;
22+
uint32_t maxEntries;
23+
EffEntry *pEntries;
24+
void *pEffectTpl;
25+
uint32_t bEffectTplLoaded;
26+
void *pLanguageEffectTplFile; // FileEntryData *pLanguageEffectTplFile;
27+
int32_t loadedLanguage;
2828
} __attribute__((__packed__));
2929

3030
static_assert(sizeof(EffWork) == 0x18);

ttyd-tools/rel/source/draw.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4564,12 +4564,12 @@ void drawEffsActive()
45644564

45654565
// Get the total amount of effs active
45664566
ttyd::effdrv::EffWork *EffWrk = ttyd::effdrv::effWorkPointer;
4567-
uint32_t MaxCount = EffWrk->effCount;
4567+
uint32_t MaxEntries = EffWrk->maxEntries;
45684568
uint32_t CurrentCount = 0;
45694569

4570-
for (uint32_t i = 0; i < MaxCount; i++)
4570+
for (uint32_t i = 0; i < MaxEntries; i++)
45714571
{
4572-
if (EffWrk->entries[i].wFlags)
4572+
if (EffWrk->pEntries[i].wFlags)
45734573
{
45744574
CurrentCount++;
45754575
}
@@ -4580,7 +4580,7 @@ void drawEffsActive()
45804580
sprintf(tempDisplayBuffer,
45814581
"Effs Active: %" PRIu32 "/%" PRIu32,
45824582
CurrentCount,
4583-
MaxCount);
4583+
MaxEntries);
45844584

45854585
drawText(tempDisplayBuffer, PosX, PosY, Alpha, Color, Scale);
45864586
}

0 commit comments

Comments
 (0)