Skip to content
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

Jump to bottom

Clean up NPC player interaction usages #1458

Merged
merged 7 commits into from
Dec 19, 2022
Merged

Clean up NPC player interaction usages #1458

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f5cb4b6
Clean up player tracking related things in NPCs
luryus Nov 30, 2022
cde53c7
Cleanup Npc_UpdateTalking usages and related things
luryus Nov 30, 2022
20e2934
Reformat
luryus Nov 30, 2022
585610b
Minor fixes based on review comments
luryus Dec 11, 2022
6c6ec3e
Remove unneeded declarations
luryus Dec 18, 2022
05a651f
More consistent function names
luryus Dec 18, 2022
4b6e847
Merge branch 'master' into npc-interaction-cleanup
luryus Dec 18, 2022
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
Prev Previous commit
Next Next commit
Remove unneeded declarations
  • Loading branch information
@luryus
luryus committed Dec 18, 2022
commit 6c6ec3e0a5c7c2c102ff121931d43d5281831542
3 changes: 0 additions & 3 deletions src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ void EnMa2_Destroy(Actor* thisx, PlayState* play);
void EnMa2_Update(Actor* thisx, PlayState* play);
void EnMa2_Draw(Actor* thisx, PlayState* play);

u16 EnMa2_GetTextId(PlayState* play, Actor* thisx);
s16 EnMa2_UpdateTalkState(PlayState* play, Actor* thisx);

void func_80AA1AE4(EnMa2* this, PlayState* play);
s32 func_80AA1C68(EnMa2* this);
void EnMa2_UpdateEyes(EnMa2* this);
Expand Down
3 changes: 0 additions & 3 deletions src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ void EnMa3_Destroy(Actor* thisx, PlayState* play);
void EnMa3_Update(Actor* thisx, PlayState* play);
void EnMa3_Draw(Actor* thisx, PlayState* play);

u16 EnMa3_GetTextId(PlayState* play, Actor* thisx);
s16 EnMa3_UpdateTalkState(PlayState* play, Actor* thisx);

void func_80AA2E54(EnMa3* this, PlayState* play);
s32 func_80AA2EC8(EnMa3* this, PlayState* play);
s32 func_80AA2F28(EnMa3* this);
Expand Down