diff options
| -rw-r--r-- | arm9/modules/59/src/mod59_021D74E0_src.c | 5 | ||||
| -rw-r--r-- | arm9/src/render_window.c | 16 | ||||
| -rw-r--r-- | include/render_window.h | 4 |
3 files changed, 11 insertions, 14 deletions
diff --git a/arm9/modules/59/src/mod59_021D74E0_src.c b/arm9/modules/59/src/mod59_021D74E0_src.c index 92880515..7d6be2ca 100644 --- a/arm9/modules/59/src/mod59_021D74E0_src.c +++ b/arm9/modules/59/src/mod59_021D74E0_src.c @@ -7,6 +7,7 @@ #include "GX_layers.h" #include "unk_02024E64.h" #include "bg_window.h" +#include "render_window.h" #include "module_52.h" extern void *FUN_02077A84(u32 heap_id, u32 param1, u32 param2, u32 param3, struct Options *options); @@ -32,10 +33,6 @@ extern u32 FUN_0200E308(void); extern void FUN_02077AC4(void *param0); -extern void FUN_0200CD68(struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u8 frame_id, u32 heap_id); - -extern void FUN_0200CB00(struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u8 frame_id, u32 heap_id); - FS_EXTERN_OVERLAY(MODULE_52); THUMB_FUNC BOOL MOD59_Init(struct UnkStruct_02006234 *param0) diff --git a/arm9/src/render_window.c b/arm9/src/render_window.c index 7a682eb6..33682cc0 100644 --- a/arm9/src/render_window.c +++ b/arm9/src/render_window.c @@ -88,10 +88,10 @@ THUMB_FUNC s32 FUN_0200CAFC(void) } THUMB_FUNC 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) { s32 r1; - if (param4 != 0) + if (frame_id != 0) { r1 = NARC_winframe_narc_0001_NCGR; } @@ -103,7 +103,7 @@ THUMB_FUNC void FUN_0200CB00( GfGfxLoader_LoadCharData( NARC_GRAPHIC_WINFRAME, r1, bg_config, layer, num_tiles, 0, FALSE, heap_id); - if (param4 == 2) + if (frame_id == 2) { r1 = NARC_winframe_narc_0045_NCLR; } @@ -192,20 +192,20 @@ THUMB_FUNC s32 FUN_0200CD64(s32 param0) } THUMB_FUNC void FUN_0200CD68( - struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5) + struct BgConfig *bg_config, u32 layer, u32 num_tiles, u32 param3, u8 frame_id, u32 heap_id) { GfGfxLoader_LoadCharData( - NARC_GRAPHIC_WINFRAME, FUN_0200CD60(param4), param0, param1, param2, 0, FALSE, param5); + NARC_GRAPHIC_WINFRAME, FUN_0200CD60(frame_id), bg_config, layer, num_tiles, 0, FALSE, heap_id); - if (param1 < 4) + if (layer < 4) { GfGfxLoader_GXLoadPal( - NARC_GRAPHIC_WINFRAME, FUN_0200CD64(param4), 0, param3 << 5, 32, param5); + NARC_GRAPHIC_WINFRAME, FUN_0200CD64(frame_id), 0, param3 << 5, 32, heap_id); return; } - GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, FUN_0200CD64(param4), 4, param3 << 5, 32, param5); + GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, FUN_0200CD64(frame_id), 4, param3 << 5, 32, heap_id); } THUMB_FUNC void DrawFrame2(struct BgConfig *bgConfig, 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, |