summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main.c4
-rw-r--r--src/sprite.c3
-rw-r--r--src/text_window.c10
3 files changed, 6 insertions, 11 deletions
diff --git a/src/main.c b/src/main.c
index 61280f5a7..3b4387dd0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -22,7 +22,7 @@ extern void rfu_REQ_stopMode(void);
extern void rfu_waitREQComplete(void);
extern bool32 sub_8087634(void);
extern bool32 sub_80875C8(void);
-extern void ClearObjectCopyRequests(void);
+extern void ClearSpriteCopyRequests(void);
extern void PlayTimeCounter_Update(void);
extern void MapMusicMain(void);
extern void EnableInterrupts(u16);
@@ -159,7 +159,7 @@ void AgbMain()
if (sub_80875C8() == 1)
{
gMain.newKeys = 0;
- ClearObjectCopyRequests();
+ ClearSpriteCopyRequests();
gUnknown_030022B4 = 1;
UpdateLinkAndCallCallbacks();
gUnknown_030022B4 = 0;
diff --git a/src/sprite.c b/src/sprite.c
new file mode 100644
index 000000000..5c17035fa
--- /dev/null
+++ b/src/sprite.c
@@ -0,0 +1,3 @@
+#include "global.h"
+
+
diff --git a/src/text_window.c b/src/text_window.c
index 356e1f339..55aedf688 100644
--- a/src/text_window.c
+++ b/src/text_window.c
@@ -1,25 +1,17 @@
#include "global.h"
#include "text.h"
+#include "text_window.h"
#include "window.h"
#include "palette.h"
extern u8 LoadBgTiles(u8 bg, const void *src, u16 size, u16 destOffset);
extern void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette);
-struct TilesPal
-{
- u32* tiles;
- u16* pal;
-};
-
extern const struct TilesPal gUnknown_0851021C[];
extern const u32 gUnknown_08DDD748[];
extern const u16 gUnknown_0851017C[];
extern const u16 gUnknown_08DDD728[];
-const u16* sub_8098C64(void);
-void sub_809882C(u8 windowId, u16 destOffset, u8 palOffset);
-
const struct TilesPal* sub_8098758(u8 id)
{
if (id > 19)