summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAkira Akashi <rubenru09@aol.com>2021-08-22 20:17:35 +0100
committerGitHub <noreply@github.com>2021-08-22 20:17:35 +0100
commitc53141353dc5627cd6b782ff93b215e8fa8d391c (patch)
tree65c3ace8ed081a86db0bc748cc78ea5cfa87e076 /include
parentd08722a7381c4c05a40ee59bb6de556616e1dfc2 (diff)
parentfe565be6ef25a91f9372dbb791fddf789e5a64c7 (diff)
Merge pull request #456 from red031000/master
two item icons and a mod59 function
Diffstat (limited to 'include')
-rw-r--r--include/font.h2
-rw-r--r--include/render_window.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/font.h b/include/font.h
index 3c0f4267..8b16b9c7 100644
--- a/include/font.h
+++ b/include/font.h
@@ -31,7 +31,7 @@ u32 FUN_02002DE0(u32 param0, u16 *str, u32 param2);
u32 FUN_02002E14(u32 param0, struct String *str, u32 param2);
s32 GetFontAttribute(u8 fontId, s32 attr);
void FUN_02002ED0(enum GFBgLayer layer, u32 baseAddr, u32 heap_id);
-void FUN_02002EEC(u32 layer, u32 baseAddr, u32 heap_id);
+void FUN_02002EEC(enum GFBgLayer layer, u32 baseAddr, u32 heap_id);
s32 FUN_02002F08(u32 param0, struct String *str, u32 param2);
u32 FUN_02002F40(u32 param0, struct String *str, u32 param2, u32 param3);
u32 FUN_02002F58(const u16 *str);
diff --git a/include/render_window.h b/include/render_window.h
index 385c61ad..6fcd6dde 100644
--- a/include/render_window.h
+++ b/include/render_window.h
@@ -43,7 +43,7 @@ struct UnkStruct_0200CABC_3
u32 FUN_0200CABC(struct BgConfig *bgConfig, u32 layer, u32 numTiles, u32 param3, u32 heap_id);
s32 FUN_0200CAFC(void);
void FUN_0200CB00(
- struct BgConfig *bg_config, u32 layer, u32 num_tiles, u32 param3, u8 param4, u32 heap_id);
+ struct BgConfig *bg_config, u32 layer, u32 num_tiles, u32 param3, u8 frame_id, u32 heap_id);
void DrawFrame1(struct BgConfig *bgConfig,
u8 bgId,
u8 x,
@@ -57,7 +57,7 @@ void ClearFrameAndWindow1(struct Window *window, BOOL copy_to_vram);
s32 FUN_0200CD60(s32 param0);
s32 FUN_0200CD64(s32 param0);
void FUN_0200CD68(
- struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5);
+ struct BgConfig *bg_config, u32 layer, u32 param2, u32 param3, u8 frame_id, u32 heap_id);
void DrawFrame2(struct BgConfig *bgConfig,
u8 bgId,
u8 x,