diff options
author | garak <garakmon@gmail.com> | 2018-10-19 16:05:14 -0400 |
---|---|---|
committer | garak <garakmon@gmail.com> | 2018-10-19 16:05:14 -0400 |
commit | 38fcc46abb36df72512f4b532d1379dab1c13af6 (patch) | |
tree | df44258d7b5a65d2a75a146c7c01b6c683b023f9 /src/script.c | |
parent | 901f3ff55715ec6bdeda5c711e7e73b4c38ab55a (diff) | |
parent | 95d8815721321f08714b97c59a97de3a59f1e0c7 (diff) |
Merge remote-tracking branch 'upstream/master' into pan-constants
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; |