diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-07 20:20:22 -0400 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-07 20:20:22 -0400 |
| commit | 50350cc2e1c26082f9d852e97e1698f7254d4145 (patch) | |
| tree | 3217b352dae2be8da75ad08a8d94ddc7f81a5017 /src/script.c | |
| parent | 1360b3a477f1107785900cd0c4e73ebf018f058c (diff) | |
| parent | a4ea0ac816f799b76ac4bec1b66c569d6b684e64 (diff) | |
Merge branch 'master' into contest-ai-cleanup
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 cb06300bf..27476dba3 100644 --- a/src/script.c +++ b/src/script.c @@ -386,7 +386,7 @@ const u8 *GetRamScript(u8 objectId, const u8 *script) } } -bool32 sub_80991F8(void) +bool32 ValidateSavedRamScript(void) { struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data; if (scriptData->magic != RAM_SCRIPT_MAGIC) @@ -402,7 +402,7 @@ bool32 sub_80991F8(void) return TRUE; } -u8 *sub_8099244(void) +u8 *GetSavedRamScriptIfValid(void) { struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data; if (!ValidateReceivedWonderCard()) @@ -426,7 +426,7 @@ u8 *sub_8099244(void) } } -void sub_80992A0(u8 *script, u16 scriptSize) +void InitRamScript_NoEventObject(u8 *script, u16 scriptSize) { if (scriptSize > sizeof(gSaveBlock1Ptr->ramScript.data.script)) scriptSize = sizeof(gSaveBlock1Ptr->ramScript.data.script); |