diff options
author | garak <garakmon@gmail.com> | 2018-10-17 12:30:45 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-17 12:30:45 -0400 |
commit | 7d88b9647f92d099177fc734f32e94fc472f2cbf (patch) | |
tree | 3b3d6ea2a092b2fd482d03145094689a05ec1b92 /src/script.c | |
parent | ff97873c309e28beec91efe11393c093a08b19d3 (diff) | |
parent | f67bbbdaaa905833f1c2a315624128aafef9a4cb (diff) |
Merge branch 'master' into event-flags
Diffstat (limited to 'src/script.c')
-rw-r--r-- | src/script.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script.c b/src/script.c index 8c868128b..c61ae7183 100644 --- a/src/script.c +++ b/src/script.c @@ -5,7 +5,7 @@ #define RAM_SCRIPT_MAGIC 51 -extern u8* gUnknown_020375C0; +extern const u8* gUnknown_020375C0; extern bool32 sub_801B27C(void); @@ -344,7 +344,7 @@ void ClearRamScript(void) CpuFill32(0, &gSaveBlock1Ptr->ramScript, sizeof(struct RamScript)); } -bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId) +bool8 InitRamScript(const u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId) { struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data; @@ -362,7 +362,7 @@ bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objec return TRUE; } -u8 *GetRamScript(u8 objectId, u8 *script) +const u8 *GetRamScript(u8 objectId, const u8 *script) { struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data; gUnknown_020375C0 = NULL; |