8 files changed, 80 insertions, 8 deletions
diff --git a/include/bg.h b/include/bg.h
new file mode 100644
index 000000000..24484dd86
--- /dev/null
+++ b/include/bg.h
@@ -0,0 +1,45 @@
+#ifndef GUARD_BG_H
+#define GUARD_BG_H
+
+enum
+{
+    BG_CTRL_ATTR_VISIBLE = 1,
+    BG_CTRL_ATTR_CHARBASEINDEX = 2,
+    BG_CTRL_ATTR_MAPBASEINDEX = 3,
+    BG_CTRL_ATTR_SCREENSIZE = 4,
+    BG_CTRL_ATTR_PALETTEMODE = 5,
+    BG_CTRL_ATTR_PRIORITY = 6,
+    BG_CTRL_ATTR_MOSAIC = 7,
+    BG_CTRL_ATTR_WRAPAROUND = 8,
+};
+
+struct BgTemplate
+{
+    u32 bg:2;
+    u32 charBaseIndex:2;
+    u32 mapBaseIndex:5;
+    u32 screenSize:2;
+    u32 paletteMode:1;
+    u32 priority:2;
+    u32 baseTile:10;
+};
+
+void ResetBgsAndClearDma3BusyFlags(u32 leftoverFireRedLeafGreenVariable);
+void InitBgsFromTemplates(u8 bgMode, const struct BgTemplate *templates, u8 numTemplates);
+void SetBgAttribute(u8 bg, u8 attributeId, u8 value);
+u16 GetBgAttribute(u8 bg, u8 attributeId);
+u32 ChangeBgX(u8 bg, u32 value, u8 op);
+u32 GetBgX(u8 bg);
+u32 ChangeBgY(u8 bg, u32 value, u8 op);
+u32 ChangeBgY_ScreenOff(u8 bg, u32 value, u8 op);
+u32 GetBgY(u8 bg);
+void SetBgAffine(u8 bg, u32 srcCenterX, u32 srcCenterY, s16 dispCenterX, s16 dispCenterY, s16 scaleX, s16 scaleY, u16 rotationAngle);
+void SetBgTilemapBuffer(u8 bg, void *tilemap);
+void UnsetBgTilemapBuffer(u8 bg);
+void CopyToBgTilemapBuffer(u8 bg, const void *src, u16 mode, u16 destOffset);
+void CopyBgTilemapBufferToVram(u8 bg);
+u16 LoadBgTiles(u8 bg, const void* src, u16 size, u16 destOffset);
+void ShowBg(u8 bg);
+void HideBg(u8 bg);
+
+#endif // GUARD_BG_H
diff --git a/include/dma3.h b/include/dma3.h
index beb00745d..ea3171662 100644
--- a/include/dma3.h
+++ b/include/dma3.h
@@ -6,7 +6,7 @@ extern u8 gDma3RequestCursor;
 
 struct DmaRequestsStruct
 {
- /* 0x00 */ u8 *src;
+ /* 0x00 */ const u8 *src;
  /* 0x04 */ u8 *dest;
  /* 0x08 */ u16 size;
  /* 0x0A */ u16 mode;
@@ -17,7 +17,7 @@ extern struct DmaRequestsStruct gDma3Requests[128];
 
 void ClearDma3Requests(void);
 void ProcessDma3Requests(void);
-int RequestDma3Copy(void *src, void *dest, u16 size, u8 mode);
+int RequestDma3Copy(const void *src, void *dest, u16 size, u8 mode);
 int RequestDma3Fill(s32 value, void *dest, u16 size, u8 mode);
 
 #endif
diff --git a/include/global.h b/include/global.h
index e694a5974..f4b2a8349 100644
--- a/include/global.h
+++ b/include/global.h
@@ -639,7 +639,8 @@ struct DaycareMon
     struct MailStruct mail;
     u8 OT_name[OT_NAME_LENGTH + 1];
     u8 monName[11];
-    u8 language;
+    u8 language_maybe : 4;
+    u8 unknown : 4;
     u32 stepsTaken;
 };
 
diff --git a/include/gpu_regs.h b/include/gpu_regs.h
new file mode 100644
index 000000000..684578f43
--- /dev/null
+++ b/include/gpu_regs.h
@@ -0,0 +1,12 @@
+#ifndef GUARD_GPU_REGS_H
+#define GUARD_GPU_REGS_H
+
+void SetGpuReg(u8 regOffset, u16 value);
+void SetGpuReg_ForcedBlank(u8 regOffset, u16 value);
+u16 GetGpuReg(u8 regOffset);
+void SetGpuRegBits(u8 regOffset, u16 mask);
+void ClearGpuRegBits(u8 regOffset, u16 mask);
+void EnableInterrupts(u16 mask);
+void DisableInterrupts(u16 mask);
+
+#endif // GUARD_GPU_REGS_H
diff --git a/include/m4a.h b/include/m4a.h
index b6c8f9072..8c3380dd8 100644
--- a/include/m4a.h
+++ b/include/m4a.h
@@ -4,6 +4,7 @@
 #include "gba/m4a_internal.h"
 
 void m4aSoundVSync(void);
+void m4aSoundVSyncOn(void);
 
 void m4aSoundInit(void);
 void m4aSoundMain(void);
diff --git a/include/pokemon.h b/include/pokemon.h
index 595ec38fd..9d01c051e 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -620,4 +620,8 @@ bool8 IsPokeSpriteNotFlipped(u16 species);
 bool8 IsMonShiny(struct Pokemon *mon);
 bool8 IsShinyOtIdPersonality(u32 otId, u32 personality);
 
+#include "sprite.h"
+
+void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3);
+
 #endif // GUARD_POKEMON_H
diff --git a/include/text.h b/include/text.h
index 73e6e5437..f584b61ea 100644
--- a/include/text.h
+++ b/include/text.h
@@ -138,28 +138,37 @@ struct FontInfo
     u8 shadowColor:4;
 };
 
-struct GlyphWidthFunc{
+struct GlyphWidthFunc
+{
     u32 font_id;
     u32 (*func)(u16 glyphId, bool32 isJapanese);
 };
 
-struct KeypadIcon {
+struct KeypadIcon
+{
     u16 tile_offset;
     u8 width;
     u8 height;
 };
 
+struct __attribute__((packed)) TextColor
+{
+    u8 fgColor;
+    u8 bgColor;
+    u8 shadowColor;
+};
+
 extern u8 gStringVar1[];
 extern u8 gStringVar2[];
 extern u8 gStringVar3[];
 extern u8 gStringVar4[];
 
 void SetFontsPointer(const struct FontInfo *fonts);
-void DeactivateAllTextPrinters (void);
+void DeactivateAllTextPrinters(void);
 u16 PrintTextOnWindow(u8 windowId, u8 fontId, u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
 bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
 void RunTextPrinters(void);
-bool8 IsTextPrinterActive(u8 id);
+bool16 IsTextPrinterActive(u8 id);
 u32 RenderFont(struct TextPrinter *textPrinter);
 void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor);
 void SaveTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor);
diff --git a/include/window.h b/include/window.h
index 36a71a1e0..20e5fefa3 100644
--- a/include/window.h
+++ b/include/window.h
@@ -30,7 +30,7 @@ struct Window
     u8 *tileData;
 };
 
-bool16 InitWindows(struct WindowTemplate *templates);
+bool16 InitWindows(const struct WindowTemplate *templates);
 u16 AddWindow(const struct WindowTemplate *template);
 int AddWindowWithoutTileMap(struct WindowTemplate *template);
 void RemoveWindow(u8 windowId);