diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-06-15 01:31:19 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-06-15 01:31:19 -0500 |
| commit | 8c5d8a550780ec370f340ad2537c5ec418740839 (patch) | |
| tree | b2763c4d325426183f9f7d9aefc27d0e2d9c9d9a /include/script.h | |
| parent | 86a26c9282f03c751fc67e7da6e0d4014f69a688 (diff) | |
| parent | 6f4bf2cb0535b1a7dc72029c65d93e3ebdb19f95 (diff) | |
fix merge conflicts
Diffstat (limited to 'include/script.h')
| -rw-r--r-- | include/script.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/script.h b/include/script.h index a4c7dd575..4070a838f 100644 --- a/include/script.h +++ b/include/script.h @@ -4,6 +4,7 @@ struct ScriptContext; typedef bool8 (*ScrCmdFunc)(struct ScriptContext *); +typedef u8 Script[]; struct ScriptContext { @@ -54,5 +55,6 @@ u32 CalculateRamScriptChecksum(void); void ClearRamScript(void); bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId); u8 *GetRamScript(u8 objectId, u8 *script); +u16 gScriptResult; #endif // GUARD_SCRIPT_H |