diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-08-27 12:54:56 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-08-27 12:54:56 -0400 |
| commit | cc891865fa1eb5a823f6a3eeb1746f05addb0d90 (patch) | |
| tree | 968957fa0473278e6fd80c70eb26489c5115c834 /arm9/src/render_window.c | |
| parent | 71a3c2e14a52026811fd50396275b0efe0ce9101 (diff) | |
| parent | c53141353dc5627cd6b782ff93b215e8fa8d391c (diff) | |
Merge remote-tracking branch 'origin/master' into pikalax_work
Diffstat (limited to 'arm9/src/render_window.c')
| -rw-r--r-- | arm9/src/render_window.c | 16 |
1 files changed, 8 insertions, 8 deletions
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, |