Merge origin/master into pikalaxalt/link

include/malloc.h

@@ -6,6 +6,12 @@
 #define calloc(ct, sz) AllocZeroed((ct) * (sz))
 #define free Free
 
+#define FREE_AND_SET_NULL(ptr)          \
+{                                       \
+    free(ptr);                          \
+    ptr = NULL;                         \
+}
+
 extern u8 gHeap[];
 void *Alloc(u32 size);
 void *AllocZeroed(u32 size);