diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-03 17:25:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-03 17:25:05 -0400 |
| commit | 585d92f298e1edd8f756f8362de45c9fadc6fcab (patch) | |
| tree | 2e3b17d37c4782f575329fc0fbe1f7bd406e6bad /src/event_object_movement.c | |
| parent | 558097f42326f19044a6351004468a46d6ee0b38 (diff) | |
| parent | ff94d49a45ef605cfaed1268aa5a230958e25cd9 (diff) | |
Merge pull request #445 from Kurausukun/ubfix
Port UBFIX Macro and Some Usages from Emerald
Diffstat (limited to 'src/event_object_movement.c')
| -rw-r--r-- | src/event_object_movement.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c index a671ada34..14914bf92 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -2561,7 +2561,13 @@ const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId) static u16 GetObjectEventFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - return GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId; + struct ObjectEventTemplate *obj = GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup); +#ifdef UBFIX + // BUG: The function may return NULL, and attempting to read from NULL may freeze the game using modern compilers. + if (obj == NULL) + return 0; +#endif // UBFIX + return obj->flagId; } static u16 GetObjectEventFlagIdByObjectEventId(u8 objectEventId) |