diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 16:17:46 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 16:17:46 -0400 |
| commit | aea30489fc3994a856ba929d075ed762c7fb1967 (patch) | |
| tree | 314df4c8afe5ef19243d63a3f7851f5e4c54fc9e /include | |
| parent | a205881ce2caa89a1b2690df9bd335201df2aeda (diff) | |
Create COPYWIN defines for CopyWindowToVram calls
Diffstat (limited to 'include')
| -rw-r--r-- | include/berry_crush.h | 2 | ||||
| -rw-r--r-- | include/window.h | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/include/berry_crush.h b/include/berry_crush.h index 9077b966e..0a0eb65d4 100644 --- a/include/berry_crush.h +++ b/include/berry_crush.h @@ -112,7 +112,7 @@ struct BerryCrushGame u8 unk8; u8 unk9; u8 unkA; - u8 unkB; + u8 textSpeed; u8 unkC; u8 unkD; u8 unkE; diff --git a/include/window.h b/include/window.h index c8b83af7a..3cb904626 100644 --- a/include/window.h +++ b/include/window.h @@ -54,8 +54,15 @@ u16 AddWindow(const struct WindowTemplate *template); int AddWindowWithoutTileMap(const struct WindowTemplate *template); void RemoveWindow(u8 windowId); void FreeAllWindowBuffers(void); + +// Mode parameter for funcs below +#define COPYWIN_MAP 1 +#define COPYWIN_GFX 2 +#define COPYWIN_BOTH 3 + void CopyWindowToVram(u8 windowId, u8 mode); -void CopyWindowRectToVram(u32 windowId, u32 mode, u32 x, u32 y, u32 w, u32 h); +void CopyWindowToVram8Bit(u8 windowId, u8 mode); + void PutWindowTilemap(u8 windowId); void PutWindowRectTilemapOverridePalette(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 palette); void ClearWindowTilemap(u8 windowId); @@ -73,7 +80,6 @@ u16 AddWindow8Bit(const struct WindowTemplate *template); void FillWindowPixelBuffer8Bit(u8 windowId, u8 fillValue); void FillWindowPixelRect8Bit(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height); void BlitBitmapRectToWindow4BitTo8Bit(u8 windowId, const u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight, u8 paletteNum); -void CopyWindowToVram8Bit(u8 windowId, u8 mode); extern void *gWindowBgTilemapBuffers[]; extern struct Window gWindows[]; |