diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-31 18:40:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-31 18:40:40 -0500 |
| commit | cbc414c44115550c811d6629c23c2e749d9d7fe3 (patch) | |
| tree | 42a2274534149cb609636c3ef98a90438a11ca33 /include/rom6.h | |
| parent | 425cb7ec71d549bed0a73bb864c3f33a1c89f1c4 (diff) | |
| parent | bc71641386573c7e865d0cec941f84310fbd648f (diff) | |
Merge pull request #698 from Slawter666/synchronise
Synchronise with pokeemerald
Diffstat (limited to 'include/rom6.h')
| -rw-r--r-- | include/rom6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rom6.h b/include/rom6.h index 105eac19a..508817163 100644 --- a/include/rom6.h +++ b/include/rom6.h @@ -3,7 +3,7 @@ extern struct MapPosition gPlayerFacingPosition; -bool8 SetLastTalkedObjectInFrontOfPlayer(u8); +bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId); u8 oei_task_add(void); void debug_sub_8120968(void); |