diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-02-14 21:17:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-14 21:17:44 -0500 |
| commit | 759f373d3153afb0e9dcf5050a700aeca036a919 (patch) | |
| tree | b43e8d72d1886eb1c38dadd67113bec77ef41a26 /src/script.c | |
| parent | 8d85ff1683437897cb0c06dd84fa2d927f560090 (diff) | |
| parent | 59695b82210cb2c95c10b52efc1a88e18c67dea9 (diff) | |
Merge pull request #488 from GriffinRichards/map-constants
Sync roamer.c, add missing map constant usage
Diffstat (limited to 'src/script.c')
| -rw-r--r-- | src/script.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/script.c b/src/script.c index c45c6744c..23973be9c 100644 --- a/src/script.c +++ b/src/script.c @@ -2,6 +2,7 @@ #include "script.h" #include "event_data.h" #include "quest_log.h" +#include "constants/maps.h" #define RAM_SCRIPT_MAGIC 51 #define SCRIPT_STACK_SIZE 20 @@ -511,9 +512,9 @@ bool32 ValidateRamScript(void) struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data; if (scriptData->magic != RAM_SCRIPT_MAGIC) return FALSE; - if (scriptData->mapGroup != 0xFF) + if (scriptData->mapGroup != MAP_GROUP(UNDEFINED)) return FALSE; - if (scriptData->mapNum != 0xFF) + if (scriptData->mapNum != MAP_NUM(UNDEFINED)) return FALSE; if (scriptData->objectId != 0xFF) return FALSE; @@ -529,9 +530,9 @@ u8 *sub_8069E48(void) return NULL; if (scriptData->magic != RAM_SCRIPT_MAGIC) return NULL; - if (scriptData->mapGroup != 0xFF) + if (scriptData->mapGroup != MAP_GROUP(UNDEFINED)) return NULL; - if (scriptData->mapNum != 0xFF) + if (scriptData->mapNum != MAP_NUM(UNDEFINED)) return NULL; if (scriptData->objectId != 0xFF) return NULL; |