Skip to content

Work on d_a_obj_timer#2350

Merged
TakaRikka merged 3 commits intozeldaret:mainfrom
carter-ktb21:d_a_obj_timer
Mar 27, 2025
Merged

Work on d_a_obj_timer#2350
TakaRikka merged 3 commits intozeldaret:mainfrom
carter-ktb21:d_a_obj_timer

Conversation

@carter-ktb21
Copy link
Copy Markdown
Contributor

No description provided.

Comment on lines +18 to +28
if (fopAcM_isSwitch(this, prm_get_sw2Save())) {
rv = 5;
} else {
if (fopAcM_isSwitch(this, prm_get_swSave())) {
mode_count_init();
} else {
mode_wait_init();
}
rv = 4;
}

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.

the 5 and 4 here can be replaced with cPhs_ERROR_e and cPhs_COMPLEATE_e


if (!field_0x570) {
field_0x56c--;
if (prm_get_SeStop() && ((field_0x56c / 30) * field_0x56c - field_0x56c) == 0) {
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.

fairly sure that pattern there with field_0x56c is a modulo operation?

* Mthd_Create__Q210daObjTimer27@unnamed@d_a_obj_timer_cpp@FPv */
static void func_804855A4() {
// NONMATCHING
/* 804855A4-804855C0 .text daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_Create */
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.

all of these functions / data that have @unnamed@d_a_obj_timer_cpp@ in them should be wrapped in an anonymous namespace to get the name mangling correct

@TakaRikka TakaRikka merged commit 57289d0 into zeldaret:main Mar 27, 2025
1 check passed
@carter-ktb21 carter-ktb21 deleted the d_a_obj_timer branch April 1, 2025 15:45
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