diff options
| author | Theo <65437533+notyourav@users.noreply.github.com> | 2023-12-30 20:07:35 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-30 20:07:35 -0800 |
| commit | bd1be092aa85e4eb1d368bef05c88eaae2a0ae84 (patch) | |
| tree | 66474a7515b56c90e1d0b94a0a39f42da6677d71 /src/code_08049DF4.c | |
| parent | 37714644960c56650dd1067b86aafa685eaf01f4 (diff) | |
| parent | 201955ea052a5188f2e59bdcdbf6c52ff158ee66 (diff) | |
Merge pull request #681 from notyourav/em
create enemy struct and enemy flags
Diffstat (limited to 'src/code_08049DF4.c')
| -rw-r--r-- | src/code_08049DF4.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/code_08049DF4.c b/src/code_08049DF4.c index e9794e59..ebfd458c 100644 --- a/src/code_08049DF4.c +++ b/src/code_08049DF4.c @@ -10,8 +10,6 @@ extern Entity* gUnk_020000B0; extern Entity* (*const gUnk_080D3BE8[])(void); -extern void ReplaceMonitoredEntity(Entity*, Entity*); - Entity* sub_08049DF4(u32 arg0) { if (gUnk_020000B0 != NULL) { return gUnk_020000B0; @@ -311,21 +309,3 @@ bool32 sub_0804A4BC(u8* arg0, u8* arg1, s32 arg2, u32 arg3) { return TRUE; } - -void sub_0804A4E4(Entity* entA, Entity* entB) { - GenericEntity* r5 = (GenericEntity*)entA; - GenericEntity* r6 = (GenericEntity*)entB; - - r6->field_0x6c.HALF.HI = (r5->field_0x6c.HALF.HI & 0x40) | 4; - r6->field_0x6c.HALF.LO = r5->field_0x6c.HALF.LO; - r6->field_0x70.HALF.LO = r5->field_0x70.HALF.LO; - r6->field_0x70.HALF.HI = r5->field_0x70.HALF.HI; - r6->field_0x6e.HALF.LO = r5->field_0x6e.HALF.LO; - r6->field_0x6e.HALF.HI = r5->field_0x6e.HALF.HI; - - CopyPositionAndSpriteOffset(&r5->base, &r6->base); - - if (r5->field_0x6c.HALF.HI & 0x40) { - ReplaceMonitoredEntity(&r5->base, &r6->base); - } -} |