From 94eb56526428935ea1f49d2b8912b5b3022d99b7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 3 Jun 2021 18:27:52 -0400 Subject: Rename window-related structs; port g2 reg inlines --- arm9/src/gf_gfx_loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arm9/src/gf_gfx_loader.c') diff --git a/arm9/src/gf_gfx_loader.c b/arm9/src/gf_gfx_loader.c index 769c90d9..66d788e6 100644 --- a/arm9/src/gf_gfx_loader.c +++ b/arm9/src/gf_gfx_loader.c @@ -3,7 +3,7 @@ #include "NNS_g2d.h" #include "gf_gfx_loader.h" -THUMB_FUNC u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id) +THUMB_FUNC u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct BgConfig * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id) { NNSG2dCharacterData * pCharData; void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, isCompressed, heap_id, FALSE); @@ -20,7 +20,7 @@ THUMB_FUNC u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct UnkS return szByte; } -THUMB_FUNC void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id) +THUMB_FUNC void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgConfig * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id) { NNSG2dScreenData * pScreenData; void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, isCompressed, heap_id, TRUE); -- cgit v1.2.3 From e29c9e21ba9b64c86ac677b2bf4a69e92e8ac34b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 4 Jun 2021 18:37:08 -0400 Subject: Port more inlines from gx lib --- arm9/src/gf_gfx_loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arm9/src/gf_gfx_loader.c') diff --git a/arm9/src/gf_gfx_loader.c b/arm9/src/gf_gfx_loader.c index 66d788e6..e6fedda8 100644 --- a/arm9/src/gf_gfx_loader.c +++ b/arm9/src/gf_gfx_loader.c @@ -30,7 +30,7 @@ THUMB_FUNC void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgC { if (szByte == 0) szByte = pScreenData->szByte; - if (FUN_0201886C(unkStruct02016B94_2, (u8)a3) != NULL) + if (GetBgTilemapBuffer(unkStruct02016B94_2, (u8) a3) != NULL) FUN_02017DFC(unkStruct02016B94_2, (u8)a3, pScreenData->rawData, szByte); FUN_02017CE8(unkStruct02016B94_2, (u8)a3, pScreenData->rawData, szByte, a4); } -- cgit v1.2.3 From ae369d76f0415f105020c6084fc1a6687c86407c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 4 Jun 2021 20:43:31 -0400 Subject: Rename more bg and window routines --- arm9/src/gf_gfx_loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arm9/src/gf_gfx_loader.c') diff --git a/arm9/src/gf_gfx_loader.c b/arm9/src/gf_gfx_loader.c index e6fedda8..eac7b417 100644 --- a/arm9/src/gf_gfx_loader.c +++ b/arm9/src/gf_gfx_loader.c @@ -13,7 +13,7 @@ THUMB_FUNC u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct BgCo { if (szByte == 0) szByte = pCharData->szByte; - FUN_02017E14(unkStruct02016B94_2, (u8)a3, pCharData->pRawData, szByte, a4); + BG_LoadCharTilesData(unkStruct02016B94_2, (u8)a3, pCharData->pRawData, szByte, a4); } FreeToHeap(pFile); } -- cgit v1.2.3 From 0ae4f320d929e4d8914002836055c1aad35d5ce3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 5 Jun 2021 15:49:41 -0400 Subject: Name remaining symbols in {unk_02016B94->bg_window}.c --- arm9/src/gf_gfx_loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arm9/src/gf_gfx_loader.c') diff --git a/arm9/src/gf_gfx_loader.c b/arm9/src/gf_gfx_loader.c index eac7b417..1dc7f50e 100644 --- a/arm9/src/gf_gfx_loader.c +++ b/arm9/src/gf_gfx_loader.c @@ -31,8 +31,8 @@ THUMB_FUNC void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgC if (szByte == 0) szByte = pScreenData->szByte; if (GetBgTilemapBuffer(unkStruct02016B94_2, (u8) a3) != NULL) - FUN_02017DFC(unkStruct02016B94_2, (u8)a3, pScreenData->rawData, szByte); - FUN_02017CE8(unkStruct02016B94_2, (u8)a3, pScreenData->rawData, szByte, a4); + BG_LoadScreenTilemapData(unkStruct02016B94_2, (u8) a3, pScreenData->rawData, szByte); + BgCopyOrUncompressTilemapBufferRangeToVram(unkStruct02016B94_2, (u8) a3, pScreenData->rawData, szByte, a4); } FreeToHeap(pFile); } -- cgit v1.2.3