diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-17 17:20:40 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-17 17:20:40 -0500 |
| commit | e9a3cc6d51ce3818eed11de585f5084342450093 (patch) | |
| tree | 414ed687f836521c1a966531e87122951c070083 /include/script.h | |
| parent | c3feb9871f4d05cd9874dd8fc0c2016eaa072864 (diff) | |
| parent | 4ae8a52473a0e4842cf140bf0c59f0276125a896 (diff) | |
Merge remote-tracking branch 'upstream/master' into move-tutor
# Conflicts:
# include/pokenav.h
# src/battle_script_commands.c
Diffstat (limited to 'include/script.h')
| -rw-r--r-- | include/script.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/script.h b/include/script.h index 386b388d0..34f4635bb 100644 --- a/include/script.h +++ b/include/script.h @@ -61,4 +61,7 @@ bool32 sub_80991F8(void); u8 *sub_8099244(void); void sub_80992A0(u8 *script, u16 scriptSize); +// srccmd.h +void sub_809BE48(u16 npcId); + #endif // GUARD_SCRIPT_H |