diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
| commit | f719abf104e304ed2f886a413d1132a75e3379b1 (patch) | |
| tree | 352be6d36f1db3f697394bc193adb7fa8142be71 /include/script.h | |
| parent | 2d604191592fbac2618d4a626f61ff1423cac828 (diff) | |
| parent | bd4a6520eaaaac186b6b26557305be8939a7ea2a (diff) | |
fix merge conflicts
Diffstat (limited to 'include/script.h')
| -rw-r--r-- | include/script.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/script.h b/include/script.h index 4070a838f..5577fcb01 100644 --- a/include/script.h +++ b/include/script.h @@ -56,5 +56,6 @@ void ClearRamScript(void); bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId); u8 *GetRamScript(u8 objectId, u8 *script); u16 gScriptResult; +extern u16 gScriptLastTalked; #endif // GUARD_SCRIPT_H |