Skip to content

d_a_npc cleanup #2466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hatal175 merged 2 commits into from
May 31, 2025
Merged

d_a_npc cleanup #2466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23c833d
d_a_npc first cleanup pass
TakaRikka May 31, 2025
5ce072f
more d_a_npc cleanup
TakaRikka May 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
307 changes: 187 additions & 120 deletions include/d/actor/d_a_npc.h
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion include/d/actor/d_a_npc_zra.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class daNpc_zrA_Path_c : public daNpcF_Path_c {
/* 80B78CFC */ int getDstPosChase(u16, cXyz, cXyz&);
/* 80B78E08 */ f32 chkPassDst(u16, cXyz);
/* 80B7EF88 */ ~daNpc_zrA_Path_c() {}
int getEndIdx() { return mpRoomPath->m_num - 1; }
int getEndIdx() { return mPathInfo->m_num - 1; }
};

STATIC_ASSERT(sizeof(daNpc_zrA_Path_c) == 0x630);
Expand Down
6 changes: 3 additions & 3 deletions include/d/actor/d_a_tag_evtarea.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ class daTag_EvtArea_c : public fopAc_ac_c {

/* 8048CD68 */ virtual ~daTag_EvtArea_c() {}

s32 getType() {
u8 type = (u8)shape_angle.z;
return type == 0xff ? 0 : type;
int getType() {
u16 type = shape_angle.z & 0xFF;
return type == 0xFF ? 0 : type;
}

s32 getNo() {
Expand Down
Loading