diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-15 10:57:22 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-11-15 10:58:05 -0500 |
| commit | c1130592faa26f4e555142c48bdc02c1378ff1ee (patch) | |
| tree | 0833c750d4786219b814a3ff2a57799137027934 /src/script.c | |
| parent | 65d3b583748bf1a8e03bc55baa31760bd5bdc384 (diff) | |
Drop some overworld prefixes
Diffstat (limited to 'src/script.c')
| -rw-r--r-- | src/script.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/script.c b/src/script.c index b10e0db49..468989fb5 100644 --- a/src/script.c +++ b/src/script.c @@ -3,6 +3,7 @@ #include "event_data.h" #include "mystery_gift.h" #include "util.h" +#include "constants/event_objects.h" #include "constants/maps.h" #include "constants/map_scripts.h" @@ -399,6 +400,8 @@ const u8 *GetRamScript(u8 objectId, const u8 *script) } } +#define NO_OBJECT OBJ_EVENT_ID_PLAYER + bool32 ValidateSavedRamScript(void) { struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data; @@ -408,7 +411,7 @@ bool32 ValidateSavedRamScript(void) return FALSE; if (scriptData->mapNum != MAP_NUM(UNDEFINED)) return FALSE; - if (scriptData->objectId != 0xFF) + if (scriptData->objectId != NO_OBJECT) return FALSE; if (CalculateRamScriptChecksum() != gSaveBlock1Ptr->ramScript.checksum) return FALSE; @@ -426,7 +429,7 @@ u8 *GetSavedRamScriptIfValid(void) return NULL; if (scriptData->mapNum != MAP_NUM(UNDEFINED)) return NULL; - if (scriptData->objectId != 0xFF) + if (scriptData->objectId != NO_OBJECT) return NULL; if (CalculateRamScriptChecksum() != gSaveBlock1Ptr->ramScript.checksum) { @@ -443,5 +446,5 @@ void InitRamScript_NoObjectEvent(u8 *script, u16 scriptSize) { if (scriptSize > sizeof(gSaveBlock1Ptr->ramScript.data.script)) scriptSize = sizeof(gSaveBlock1Ptr->ramScript.data.script); - InitRamScript(script, scriptSize, MAP_GROUP(UNDEFINED), MAP_NUM(UNDEFINED), 0xFF); + InitRamScript(script, scriptSize, MAP_GROUP(UNDEFINED), MAP_NUM(UNDEFINED), NO_OBJECT); } |