Skip to content

d_a_e_zs (a.k.a. Stallord's zombie soldiers) equivalent#2313

Merged
TakaRikka merged 4 commits intozeldaret:mainfrom
YunataSavior:dev_d_a_e_zs
Mar 8, 2025
Merged

d_a_e_zs (a.k.a. Stallord's zombie soldiers) equivalent#2313
TakaRikka merged 4 commits intozeldaret:mainfrom
YunataSavior:dev_d_a_e_zs

Conversation

@YunataSavior
Copy link
Copy Markdown
Contributor

Feel free to give whatever style feedback, and I'll incorporate it.

/* 8083329C-8083364C 0002DC 03B0+00 1/1 0/0 0/0 .text damage_check__8daE_ZS_cFv */
void daE_ZS_c::damage_check() {
// NONMATCHING
/* 808353C8-808353D0 00007C 0006+02 1/1 0/0 0/0 .data eff_Damage_id$3979 */
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can remove the symbol info comment when its an in-function static imo, the info isnt particularly useful for these

Comment on lines +465 to +471
if (field_0x670) {
--field_0x670;
}

if (field_0x671) {
--field_0x671;
}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since these appear to be timers or counters of some sort, it's better to do an explicit comparison with 0 imo


/* 808346DC-808346E4 00171C 0008+00 1/0 0/0 0/0 .text daE_ZS_IsDelete__FP8daE_ZS_c */
static bool daE_ZS_IsDelete(daE_ZS_c* param_0) {
static bool daE_ZS_IsDelete(daE_ZS_c* i_this) {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remember that all actor base methods (create, delete, isDelete, execute, draw) should return int values

int phase = dComIfG_resLoad(&mPhase, "E_ZS");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_ZS PARAM %x\n", fopAcM_GetParam(this));
if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)useHeapInit, 0xfc0)) {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor style thing again, but i like to use uppercase for hex literal values

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I cleaned up a few cases, though I will try to do this moving forward.

fopAc_CULLBOX_CUSTOM_e, // cullType
};

/* 80835344-80835344 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very minor cleanup thing, but these stringbase lines that end up at the end of TUs sometimes can just be removed. they're unimportant

@TakaRikka TakaRikka merged commit 52b23ad into zeldaret:main Mar 8, 2025
1 check passed
@YunataSavior YunataSavior deleted the dev_d_a_e_zs branch March 8, 2025 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants