[headers 12] Add kaleido_manager.h, move various protos to headers (#2174)

* [headers 12] add kaleido_manager.h, move various protos to headers

* BSS

* bss

4 files changed, 7 insertions, 7 deletions

diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index ea27b5edc..ea5bf9672 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -212,7 +212,7 @@ s16 sLightningFlashAlpha;
 s16 sSunDepthTestX;
 s16 sSunDepthTestY;
 
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:96 gc-jp-ce:96 gc-jp-mq:96 gc-us:96 gc-us-mq:96"
+#pragma increment_block_number "gc-eu:112 gc-eu-mq:112 gc-jp:96 gc-jp-ce:96 gc-jp-mq:96 gc-us:96 gc-us-mq:96"
 
 LightNode* sNGameOverLightNode;
 LightInfo sNGameOverLightInfo;
diff --git a/src/libc/memmove.c b/src/libc/memmove.c
index 8ff5ec5f6..302981f58 100644
--- a/src/libc/memmove.c
+++ b/src/libc/memmove.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "string.h"
 
 /**
  * memmove: copies `len` bytes from memory starting at `src` to memory starting at `dest`.
@@ -12,8 +12,8 @@
  * @return dest
  */
 void* memmove(void* dest, const void* src, size_t len) {
-    u8* d = dest;
-    const u8* s = src;
+    char* d = dest;
+    const char* s = src;
 
     if (d == s) {
         return dest;
diff --git a/src/libc/memset.c b/src/libc/memset.c
index ec699c7ce..31dba02ed 100644
--- a/src/libc/memset.c
+++ b/src/libc/memset.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "string.h"
 
 /**
  * memset: sets `len` bytes to `val` starting at address `dest`.
@@ -12,7 +12,7 @@
  * @return dest
  */
 void* memset(void* dest, int val, size_t len) {
-    u8* ptr = dest;
+    char* ptr = dest;
 
     while (len--) {
         *ptr++ = val;
diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c
index 77f1c0325..dc3691ef0 100644
--- a/src/overlays/actors/ovl_Fishing/z_fishing.c
+++ b/src/overlays/actors/ovl_Fishing/z_fishing.c
@@ -15,7 +15,7 @@
 #include "cic6105.h"
 #endif
 
-#pragma increment_block_number "gc-eu:140 gc-eu-mq:140 gc-jp:142 gc-jp-ce:142 gc-jp-mq:142 gc-us:142 gc-us-mq:142"
+#pragma increment_block_number "gc-eu:139 gc-eu-mq:139 gc-jp:141 gc-jp-ce:141 gc-jp-mq:141 gc-us:141 gc-us-mq:141"
 
 #define FLAGS ACTOR_FLAG_4