unk_020215A0 #304

PikalaxALT · 2024-02-20T01:45:17Z

follows from #302

red031000

few things
also as a more general point, can we rename ObjCharTransfer to VramTransfer (or CharVramTransfer if it's specific for chars and there are other vram transfers out there)
just cause we already started referring to the process as vram transfer, and it's weird seeing ObjCharTransfer call NNS's vram transfer funcs and not be named the same thing (also it's inconsistent with nitrogfx)
sorry if I was a bit harsh, I tend to do that sometimes, I get annoyed by minor things, nothing personal ofc

main.lsf

red031000 · 2024-05-10T06:56:53Z

src/credits/credits.c

@@ -463,15 +463,15 @@ static void LoadBgGraphics(CreditsAppWork *work) {
 }

 static void CreateOamAndObjResMgrs(CreditsAppWork *work) {
-    UnkStruct_020215A0 temp;
+    ObjCharTransferTemplate temp;


rename from temp?

red031000 · 2024-05-10T06:58:02Z

include/constants/global.h

@@ -13,6 +13,15 @@

 #define PARTY_SIZE 6

+// alias
+#ifndef PM_ASM
+// NNS_G2D_VRAM_TYPE_3DMAIN


should this be in global.h? wouldn't it be more appropriate to put it in an nns vram header, or even just a generic vram header?

we should absolutely NOT put something in an sdk header that did not originally come from that sdk, this is to make hotswapping the sdk later actually feasible

understandable, however, it should be in a generic vram header then, and not in global.h

this should still not be in global.h, needs to be moved out of here

Where would you put it?

constants/vram.h, it would be a new file
also any vram transfer file that's used by all of them is also acceptable imo

red031000 · 2024-05-10T06:59:47Z

include/constants/global.h

+// NNS_G2D_VRAM_TYPE_3DMAIN
+#define NNS_G2D_VRAM_TYPE_NEITHER   ((NNS_G2D_VRAM_TYPE)0)
+// NNS_G2D_VRAM_TYPE_MAX
+#define NNS_G2D_VRAM_TYPE_BOTH      ((NNS_G2D_VRAM_TYPE)(NNS_G2D_VRAM_TYPE_2DMAIN|NNS_G2D_VRAM_TYPE_2DSUB))


both is a weird one for this, since for me in my brain both means 2d and 3d, but here both is 2dmain and sub
suggestion:
NNS_G2D_VRAM_TYPE_2DMAIN_SUB
or similar (2DBOTH may be also acceptable)

red031000 · 2024-05-10T07:00:48Z

src/intro_movie.c

@@ -185,10 +185,10 @@ static void IntroMovie_InitSpriteGraphicsHW(IntroMovieOverlayData *data) {
    GX_SetOBJVRamModeChar(GX_OBJVRAMMODE_CHAR_1D_32K);
    GXS_SetOBJVRamModeChar(GX_OBJVRAMMODE_CHAR_1D_32K);

-    UnkStruct_020215A0 sp14 = {10, 0, 0, HEAP_ID_INTRO_MOVIE};
-    sub_020215A0(&sp14);
+    ObjCharTransferTemplate sp14 = {10, 0, 0, HEAP_ID_INTRO_MOVIE};


rename sp14

red031000 · 2024-05-10T07:17:08Z

src/obj_char_transfer.c

+    }
+}
+
+static BOOL getBlockNumAndFreeSpaceForTransfer(int vram, u32 *blockNumMain, u32 *blockNumSub, u32 size, u32 *freeSpaceMain, u32 *freeSpaceSub) {


I didn't see a static declaration at the top of the file for this, though I could just be blind
also needs a prefix for this func

you are blind. also, i omitted the prefix and used camelCase because this function is local and operates only on primitive types

ehhhhhh, it's still part of object transfer tbh....

red031000 · 2024-05-10T07:17:50Z

src/obj_char_transfer.c

+    }
+}
+
+static void reserveTransferBlocksByVramOffsetAndSize(NNS_G2D_VRAM_TYPE vram, u32 offsetMain, u32 offsetSub, u32 sizeMain, u32 sizeSub) {


prefix, declaration

i say leave as-is, since it's a static function that does not act on any of this file's struct types

ehh that is a fair point, however it is associated with ObjCharTransfer so imo it should have that prefix, even if it does not act on the struct itself

src/obj_char_transfer.c

red031000 · 2024-05-10T07:20:22Z

src/obj_char_transfer.c

+        break;
+    case GX_VRAM_OBJ_16_F:
+    case GX_VRAM_OBJ_16_G:
+        sObjCharTransferTasksManager->vramCapacityMain = 16 * 1024;


I'd suggest some constants here as it'd make it cleaner, but I don't actually know what to suggest

red031000 · 2024-05-10T07:23:42Z

src/obj_char_transfer.c

+    *bitIndex = arrayBitIndex & 7;
+}
+
+static void boundsFixOffsetAndSize(u32 baseOffset, u32 curOffset, u32 size, int *correctedOffset, int *correctedSize) {


prefix, declaration

PikalaxALT · 2024-05-10T11:43:57Z

the "Obj" refers to character data destined for object memory rather than background memory.

red031000 · 2024-05-10T11:47:02Z

tbh I kinda have to trust your judgement with obj vs vram, this is one area that I lack quite a bit of knowledge on, and well, AFAIK it's not exactly well documented, so...

red031000 · 2024-05-10T16:54:07Z

build failed

red031000 · 2024-05-22T02:42:49Z

include/constants/global.h

@@ -13,6 +13,15 @@

 #define PARTY_SIZE 6

+// alias
+#ifndef PM_ASM
+// NNS_G2D_VRAM_TYPE_3DMAIN


this should still not be in global.h, needs to be moved out of here

red031000 · 2024-05-22T02:43:41Z

src/obj_char_transfer.c

+} *sObjCharTransferTasksManager;
+
+static BOOL ObjCharTransfer_TaskExistsByID(int resId);
+static void resetAllTransferTasks(void);


still leaning towards prefix for this, I can understand why you may not want to have it though

red031000 · 2024-05-22T02:44:24Z

src/obj_char_transfer.c

+    }
+}
+
+static BOOL getBlockNumAndFreeSpaceForTransfer(int vram, u32 *blockNumMain, u32 *blockNumSub, u32 size, u32 *freeSpaceMain, u32 *freeSpaceSub) {


ehhhhhh, it's still part of object transfer tbh....

red031000

lgtm

PikalaxALT added 7 commits February 19, 2024 09:47

through sub_02021910

c1f4082

through sub_02021C9C

5286b0f

unk_020215A0.c documentation, 1

6781ed8

remove defunct include

1155650

through sub_02021F54

514d08f

Finish unk_020215A0 decomp

c98bdb2

unk_020215A0.c documentation, 2

4f2eb1a

PikalaxALT force-pushed the unk_020215A0 branch from e1acf4d to 4f2eb1a Compare February 21, 2024 01:52

PikalaxALT added 9 commits April 12, 2024 17:59

Merge branch 'unk_0200ACF0' into unk_020215A0

31bb52c

Merge branch 'unk_0200ACF0' into unk_020215A0

d569083

documentation

e87b126

more documentation

fa2d0ee

Merge branch 'unk_0200ACF0' into unk_020215A0

cf5b3ed

apply filename change to main.lsf

fb9527c

fix building

daf1fac

Merge branch 'master' into unk_020215A0

c2f8fbc

documentation

f1e8aec

PikalaxALT marked this pull request as ready for review April 24, 2024 23:40

red031000 requested changes May 10, 2024

View reviewed changes

address review comments

01c5a97

forgot i'd typedeffed the struct in the header lmao

076a538

PikalaxALT requested a review from red031000 May 14, 2024 11:45

red031000 requested changes May 22, 2024

View reviewed changes

Fine, have your darn prefix!

9607353

PikalaxALT added the DECOMP label May 22, 2024

Merge branch 'master' into unk_020215A0

a18174e

PikalaxALT requested a review from red031000 May 24, 2024 23:30

fix building

2431e23

red031000 approved these changes May 28, 2024

View reviewed changes

red031000 merged commit e1f0dee into pret:master May 28, 2024
1 check passed

github-actions bot pushed a commit that referenced this pull request May 28, 2024

Merge pull request #304 from PikalaxALT/unk_020215A0

04463bb

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

unk_020215A0 #304

unk_020215A0 #304

PikalaxALT commented Feb 20, 2024

red031000 left a comment

red031000 May 10, 2024

red031000 May 10, 2024

PikalaxALT May 10, 2024

red031000 May 10, 2024

red031000 May 22, 2024

PikalaxALT May 22, 2024

red031000 May 22, 2024

red031000 May 10, 2024

red031000 May 10, 2024

red031000 May 10, 2024

PikalaxALT May 10, 2024

red031000 May 22, 2024

red031000 May 10, 2024

PikalaxALT May 10, 2024

red031000 May 10, 2024

red031000 May 10, 2024

red031000 May 10, 2024

PikalaxALT commented May 10, 2024

red031000 commented May 10, 2024

red031000 commented May 10, 2024

red031000 May 22, 2024

red031000 May 22, 2024

red031000 May 22, 2024

red031000 left a comment

unk_020215A0 #304

unk_020215A0 #304

Conversation

PikalaxALT commented Feb 20, 2024

red031000 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PikalaxALT commented May 10, 2024

red031000 commented May 10, 2024

red031000 commented May 10, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

red031000 left a comment

Choose a reason for hiding this comment