summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2020-06-20 14:24:42 -0400
committerGitHub <noreply@github.com>2020-06-20 14:24:42 -0400
commitb64e6294325527938bc4d95f87cc79b6a2b32ac8 (patch)
treed79e43498e57e6e16bbb993fca4997f641837b1a /include
parent16b091058e6135f9b7875fcf074d812d610df380 (diff)
parent0276df552ddad1e5dca278daf9e7826d285d9dc3 (diff)
Merge pull request #182 from PikalaxALT/pikalax_work
Minor fixes
Diffstat (limited to 'include')
-rw-r--r--include/MWC_string.h1
-rw-r--r--include/string16.h6
2 files changed, 4 insertions, 3 deletions
diff --git a/include/MWC_string.h b/include/MWC_string.h
index d2980fb6..79639239 100644
--- a/include/MWC_string.h
+++ b/include/MWC_string.h
@@ -4,5 +4,6 @@
#include "nitro/types.h"
void * memset(void *, int, u32);
+void * memcpy(void *, const void *, u32);
#endif //GUARD_MWC_STRING_H
diff --git a/include/string16.h b/include/string16.h
index 91888a7b..71880020 100644
--- a/include/string16.h
+++ b/include/string16.h
@@ -3,11 +3,11 @@
struct String
{
- u16 len;
- u16 pos;
+ u16 maxsize;
+ u16 size;
u32 magic;
- u16 unk8;
u16 data[1];
+ u8 padding[2];
};
struct String * String_ctor(u32 count, u32 heap_id);