diff options
| author | theo3 <arisstephenson2@gmail.com> | 2021-03-21 22:59:52 -0700 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2021-03-21 22:59:52 -0700 |
| commit | f56a1cade6911129ea32d48727a70ce8f9bc783f (patch) | |
| tree | a3bb7d9a96555fd227aae887921af20c228e9e71 /src/code_08077B98.c | |
| parent | 8734f766b467b5f469afd6b24b5cf07be7e53ad0 (diff) | |
| parent | 41684172807db9cb74cfe2879e527eb2fcb6b230 (diff) | |
fix merge conflict
Diffstat (limited to 'src/code_08077B98.c')
| -rw-r--r-- | src/code_08077B98.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/code_08077B98.c b/src/code_08077B98.c index c3fbf5dd..856dc44b 100644 --- a/src/code_08077B98.c +++ b/src/code_08077B98.c @@ -82,7 +82,7 @@ void* sub_08077C54(UnkItemStruct* unk) { Entity* sub_08077C94(ItemBehavior* arg0, u32 arg1) { Entity* iVar1; - iVar1 = FindEntityInListBySubtype(8, gUnk_0811BE48[arg1].unk[3], 2); + iVar1 = FindEntityByID(8, gUnk_0811BE48[arg1].unk[3], 2); if (iVar1 == NULL) { return NULL; } |