Register Hall of Fame #313

PikalaxALT · 2024-04-04T00:41:40Z

No description provided.

adrienntindall · 2024-04-13T02:01:12Z

lib/include/nitro/fx/fx_mtx44.h

+}
+
+static inline void MTX_Copy44 (const MtxFx44 * pSrc, MtxFx44 * pDst) {
+


Remove weird extra new lines in the functions in this file

whoops! those were leftovers from automatic removal of SDK_ASSERT calls

adrienntindall · 2024-04-13T02:02:55Z

main.lsf

+	Object asm/unk_02097BE0.o
+	Object asm/unk_02097D3C.o
+	Object src/pokemon_mood.o
+	Object src/unk_02097F6C.o


Why'd you flip spaces -> tabs in this file, and why only partially? Stay consistent pls

must've been a bad merge

adrienntindall · 2024-04-13T02:07:13Z

src/battle_arcade_game_board.c

@@ -1228,11 +1228,11 @@ static void ov84_0223F2B4(GAME_BOARD_SUB_3E8 *work, Party *playerParty, Party *o
    ov84_0223F5E4(work, playerParty, opponentParty, type);

    for (i = 0; i < 11; i++) {
-        sub_0200ACF0(work->resourceObj[i][0]);
+        sub_0200ACF0(work->resourceObj[i][GF_GFX_RES_TYPE_CHAR]);


out of scope but would it be worth changing the resource obj into a struct proper, it will prolly be more readable in the long run instead of having to use index consts each time but Im not sure what issues it might introduce

adrienntindall · 2024-04-13T02:13:00Z

src/register_hall_of_fame.c

+    data->msgFormat = MessageFormat_New(HEAP_ID_REGISTER_HALL_OF_FAME);
+    data->strbuf1 = String_New(500, HEAP_ID_REGISTER_HALL_OF_FAME);
+    data->strbuf2 = String_New(500, HEAP_ID_REGISTER_HALL_OF_FAME);
+    data->narcA094 = NARC_New(NARC_a_1_0_1, HEAP_ID_REGISTER_HALL_OF_FAME);


hof graphics narc?

not yet identified; there's a reason this PR was not marked as "ready for review" (at time of review)

adrienntindall · 2024-04-13T02:13:17Z

src/register_hall_of_fame.c

+    data->strbuf1 = String_New(500, HEAP_ID_REGISTER_HALL_OF_FAME);
+    data->strbuf2 = String_New(500, HEAP_ID_REGISTER_HALL_OF_FAME);
+    data->narcA094 = NARC_New(NARC_a_1_0_1, HEAP_ID_REGISTER_HALL_OF_FAME);
+    data->narcA180 = NARC_New(NARC_a_1_8_0, HEAP_ID_REGISTER_HALL_OF_FAME);


pokemon graphics narc?

adrienntindall · 2024-04-13T02:27:06Z

src/unk_0200ACF0.c

+    GF_ASSERT(GF2DGfxResObj_GetResType(obj) == GF_GFX_RES_TYPE_CHAR);
+
+    int id = GF2DGfxResObj_GetResID(obj);
+    return sub_02021910(id);


return sub_02021910(GF2DGfxResObj_GetResID(obj))

adrienntindall · 2024-04-13T02:27:28Z

src/unk_0200ACF0.c

+    sub_02021A50(imgProxy);
+}
+
+// ------------------


adrienntindall · 2024-04-13T02:28:53Z

src/unk_020215A0.c

+        MI_CpuClear32(sObjCharTransferTasksManager, sizeof(struct ObjCharTransferTasksManager));
+        sObjCharTransferTasksManager->max = template->unk_00;
+        sObjCharTransferTasksManager->tasks = (ObjCharTransferTask *)AllocFromHeap(template->heapId, sizeof(ObjCharTransferTask) * sObjCharTransferTasksManager->max);
+        for (int i = 0; i < template->unk_00; ++i) {


unk_00 is a task count?

adrienntindall · 2024-04-13T02:29:19Z

src/unk_020215A0.c

+
+void sub_020216F4(u32 offset, u32 size, NNS_G2D_VRAM_TYPE vram) {
+    int newOffset;
+    int sp4;


no sp nomenclaure

adrienntindall · 2024-04-13T02:31:03Z

src/unk_020215A0.c

+    sObjCharTransferTasksManager = a0;
+}
+
+void ObjCharTransferTask_Reset(ObjCharTransferTask *a0) {


go through and rename all the unown vars to task or the like for the now documented ObjCharTranserTask

red031000

I'm sorry I can't fucking do this
the lib files are a mess, they're very clearly copied almost verbatim from nintendo's sdk, with no respect to style, whether it fits in, or even whether it makes any sense whatsoever in the context of the repo
please for the love of FUCK don't EVER do this shit, it genuinely makes me really angry
fix it and I will review the rest
and for EVERYONE working on this project
NEVER put in code that's copy pasted from GF or nintendo without at least changing it so it makes sense and fits the style for fuck's sake
words cannot express how pissed off I am

sorry it's not personal or anything, this is just genuinely... really bad

red031000 · 2024-05-28T03:23:03Z

asm/include/overlay_12_battle_controller.inc

@@ -7,7 +7,7 @@
 .public GetMonData
 .public GetPercentProgressTowardsNextLevel
 .public GetMonExpBySpeciesAndLevel
-.public sub_020708D8
+.public GetMonPicHeightBySpeciesGenderForme


PokemonPicture_GetHeightBySpeciesGenderForm
(we are not using Forme, we already decided against it)

red031000 · 2024-05-28T03:26:20Z

asm/overlay_63.s

delete associated .inc file pls

red031000 · 2024-05-28T03:27:19Z

asm/unk_02013FDC.s

delete .inc

red031000 · 2024-05-28T03:30:16Z

include/unk_02007FD8.h

 void sub_020087A4(u32 *a0, int a1, int dy);
+void sub_02009264(UnkStruct_02009264 *a0, struct UnkStruct_02072914_sub_sub *a1);


red031000 · 2024-05-28T03:32:15Z

include/unk_02007FD8.h

+    u8 unk_2;
+    u8 unk_3;
+    u8 unk_4[10];
+    struct UnkStruct_02072914_sub_sub *unk_10;


red031000 · 2024-05-28T03:47:38Z

lib/include/nitro/gx/g3.h

+
+typedef enum {
+	GX_TEXREPEAT_NONE    = 0,
+	GX_TEXREPEAT_S       = 1,


also can we please use SCALE and TRANSLATE and not S and T

red031000 · 2024-05-28T03:49:38Z

lib/include/nitro/gx/g3.h

 } GXCull;

+#ifdef SDK_ADS
+    typedef struct {


what thr fuck is an SDK_ADS????
this entire struct def doesn't follow the style either
indentation, struct name, also don't embed structs like this

red031000 · 2024-05-28T03:50:37Z

lib/include/nitro/gx/g3.h

+#define GX_PACK_VIEWPORT_PARAM(x1, y1, x2, y2)  ((u32)((x1) | ((y1) << 8) | ((x2) << 16) | ((y2) << 24)))
+
+typedef struct {
+    u8 *curr_cmd;


does not follow style, var names, struct name, check indentation too

lib/include/nitro/gx/g3b.h

Review comments invalid

red031000

most of these aren't really blocking, if you disagree feel free to let me know

red031000 · 2024-05-30T05:33:23Z

asm/include/overlay_12_battle_controller.inc

@@ -7,7 +7,7 @@
 .public GetMonData
 .public GetPercentProgressTowardsNextLevel
 .public GetMonExpBySpeciesAndLevel
-.public sub_020708D8
+.public GetMonPicHeightBySpeciesGenderForme


PokemonPicture_GetHeightBySpeciesGenderForm (or similar)

red031000 · 2024-05-30T05:36:25Z

include/unk_02013FDC.h

+typedef struct UnkStruct_02014E30 {
+    int x;
+    int y;
+    int w;


width and heigh instead of w and h (not blocking)

red031000 · 2024-05-30T05:37:26Z

include/unk_02013FDC.h

-void sub_020145B4(const void *a0, u32 a1, u32 a2, u32 a3, u32 a4, u32 a5, void *a6);
+void sub_02014494(NarcId narcId, s32 fileId, HeapID heapId, int x, int y, int width, int height, void *dest, u32 pid, BOOL isAnimated, int whichFacing, int species);
+void sub_02014510(NarcId narcId, s32 fileId, HeapID heapId, UnkStruct_02014E30 *a3, void *dest, u32 personality, BOOL isAnimated, int whichFacing, int species);
+void sub_02014540(NarcId narcId, s32 fileId, HeapID heapId, void *dest, u32 personality, BOOL isAnimated, int whichFacing, int species);


facingDirection instead of whichFacing, either is technically fine, it just feels facingDirection is more natural

red031000 · 2024-05-30T05:39:01Z

lib/include/nitro/fx/fx_mtx44.h

+}
+
+static inline void MTX_Frustum (fx32 t, fx32 b, fx32 l, fx32 r, fx32 n, fx32 f, MtxFx44 * mtx) {
+	MTX_FrustumW(t, b, l, r, n, f, FX32_ONE, mtx);


don't mix tabs and spaces/correct indentation level

red031000 · 2024-05-30T05:40:01Z

lib/include/nitro/gx/g3.h

@@ -147,20 +150,77 @@ typedef enum {
    GX_MTXMODE_TEXTURE = 3
 } GXMtxMode;

-#define GX_PACK_VIEWPORT_PARAM(x1, y1, x2, y2)  ((u32)((x1) | ((y1) << 8) | ((x2) << 16) | ((y2) << 24)))
+typedef enum {
+	GX_TEXGEN_NONE        = 0,


mixed tabs and spaces in this file

red031000 · 2024-05-30T06:43:17Z

src/register_hall_of_fame.c

+           confetti->particles[i].unk_08[1].y = confetti->particles[i].unk_08[0].y;
+           confetti->particles[i].unk_08[2].y = confetti->particles[i].unk_08[3].y;
+           VEC_Fx16Add(&confetti->particles[i].unk_20, &confetti->particles[i].unk_26, &confetti->particles[i].unk_20);
+           MTX_Identity44(&confetti->particles[i].unk_2C);


particles 2C is the translation matrix

red031000 · 2024-05-30T06:45:01Z

src/register_hall_of_fame.c

+           VEC_Fx16Add(&confetti->particles[i].unk_20, &confetti->particles[i].unk_26, &confetti->particles[i].unk_20);
+           MTX_Identity44(&confetti->particles[i].unk_2C);
+           MTX_TransApply44(&confetti->particles[i].unk_2C, &confetti->particles[i].unk_2C, confetti->particles[i].unk_08[0].x, confetti->particles[i].unk_08[0].y, confetti->particles[i].unk_08[0].z);
+           G3B_LightColor(&confetti->gxDlInfo, GX_LIGHTID_0, RGB(11, 11, 11));           G3B_LightColor(&confetti->gxDlInfo, GX_LIGHTID_1, confetti->particles[i].color);           SetVec(sp20, 0, FX16_ONE - 1, -FX16_ONE + 1);


are these all on the same line? should they be?

red031000 · 2024-05-30T06:46:14Z

src/register_hall_of_fame.c

+           MTX_Identity44(&confetti->particles[i].unk_2C);
+           MTX_TransApply44(&confetti->particles[i].unk_2C, &confetti->particles[i].unk_2C, confetti->particles[i].unk_08[0].x, confetti->particles[i].unk_08[0].y, confetti->particles[i].unk_08[0].z);
+           G3B_LightColor(&confetti->gxDlInfo, GX_LIGHTID_0, RGB(11, 11, 11));           G3B_LightColor(&confetti->gxDlInfo, GX_LIGHTID_1, confetti->particles[i].color);           SetVec(sp20, 0, FX16_ONE - 1, -FX16_ONE + 1);
+           VEC_Fx16Normalize(&sp20, &sp20);


sp20 is the light vector

red031000 · 2024-05-30T06:48:02Z

src/register_hall_of_fame.c

+           SetVec(sp20, 0, -FX16_ONE + 1, FX16_ONE - 1);
+           VEC_Fx16Normalize(&sp20, &sp20);
+           G3B_LightVector(&confetti->gxDlInfo, GX_LIGHTID_1, sp20.x, sp20.y, sp20.z);
+           MTX_RotX44(&sp28, FX_SinIdx((u16)confetti->particles[i].unk_20.x), FX_CosIdx((u16)confetti->particles[i].unk_20.x));


sp28 is the rotation matrix

red031000 · 2024-05-30T06:53:59Z

src/unk_02013FDC.c

I'm guessing this file deals with spinda's spots, but that's a complete guess

PikalaxALT added 30 commits March 31, 2024 01:55

RegisterHallOfFame_Init

0e6378b

through RegisterHallOfFame_Main

927d860

through ov63_0221C044

0bc1739

through ov63_0221C228

ada9b58

through ov63_0221C368

2b36b63

REGHOF_SCENE enum; replace.sh mac compat

d307c66

Fill out RegisterHallOfFameData struct

8932254

through RegisterHallOfFame_Scene7

35e5d01

through ov63_0221C954

46df46d

through ov63_0221C9E0; m2ctx.sh mac compat

0ee7b44

through ov63_0221CB94

cea36e0

through ov63_0221CE7C

02827d0

through ov63_0221D344

913da02

RegisterHallOfFame_ShowMon_LeftSide

47bd4e8

RegisterHallOfFame_ShowMon_RightSide

39222a7

through ov63_0221E55C

3952417

ov63_0221E5A0

4e40e72

through ov63_0221EC04

db3e17f

ov63_0221EC1C

7627c4e

through ov63_0221F1D0

1af891b

through ov63_0221F368

616bacf

ov63_0221F3F4

d3c1a4f

through ov63_0221F614

e4b6820

Finish register_hall_of_fame.c code

c5219da

Merge branch 'master' into hall_of_fame

11f5acb

data to c (no inline)

a3eb004

fix wayward indents

9300f40

documentation step

bf45af6

ARRAY_ASSIGN macro

c45b0af

register hall of fame documentation, 1

4b529ef

PikalaxALT added 4 commits April 11, 2024 21:50

documentation, 2

3c72677

documentation, 3

b874703

Merge branch 'unk_020215A0' into hall_of_fame

97c7d8a

more documentation

13ee35f

adrienntindall requested changes Apr 13, 2024

View reviewed changes

PikalaxALT added 2 commits April 13, 2024 10:30

minor cleanup

da60eeb

Merge branch 'unk_020215A0' into hall_of_fame

fb245b1

PikalaxALT force-pushed the hall_of_fame branch from 2256b60 to fb245b1 Compare April 14, 2024 15:01

PikalaxALT and others added 9 commits April 15, 2024 07:32

Merge branch 'unk_020215A0' into hall_of_fame

1512d35

Merge branch 'unk_020215A0' into hall_of_fame

96959d5

Merge branch 'master' into hall_of_fame

8dfe5b6

Merge branch 'unk_020215A0' into hall_of_fame

4ed8c2f

unk_02013FDC.s through sub_02014350

ef75a85

remaining code in unk_02013FDC.s

f34feaa

unk_02013FDC data to C

51a8cfe

update register_hall_of_fame.c calls to unk_02013FDC

3c5cb06

mon facing constants

7f89c20

PikalaxALT marked this pull request as ready for review May 14, 2024 11:46

PikalaxALT mentioned this pull request May 14, 2024

Pokepic #316

Open

PikalaxALT requested a review from adrienntindall May 21, 2024 11:22

PikalaxALT added the DECOMP label May 22, 2024

PikalaxALT added 2 commits May 22, 2024 19:30

Merge branch 'master' into hall_of_fame

3953f42

Merge branch 'master' into hall_of_fame

846a011

red031000 previously requested changes May 28, 2024

View reviewed changes

adrienntindall previously approved these changes May 29, 2024

View reviewed changes

Remove unused asm includes

2c1cb66

PikalaxALT dismissed adrienntindall’s stale review via 2c1cb66 May 29, 2024 11:12

red031000 requested changes May 30, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Register Hall of Fame #313

Register Hall of Fame #313

PikalaxALT commented Apr 4, 2024

adrienntindall Apr 13, 2024

PikalaxALT Apr 13, 2024

adrienntindall Apr 13, 2024

PikalaxALT Apr 13, 2024

adrienntindall Apr 13, 2024

adrienntindall Apr 13, 2024

PikalaxALT Apr 13, 2024

adrienntindall Apr 13, 2024

adrienntindall Apr 13, 2024

adrienntindall Apr 13, 2024

adrienntindall Apr 13, 2024

adrienntindall Apr 13, 2024

adrienntindall Apr 13, 2024

red031000 left a comment

red031000 May 28, 2024

red031000 May 28, 2024

red031000 May 28, 2024

red031000 May 28, 2024

red031000 May 28, 2024

red031000 May 28, 2024

red031000 May 28, 2024

red031000 May 28, 2024

red031000 left a comment

red031000 May 30, 2024

red031000 May 30, 2024

red031000 May 30, 2024

red031000 May 30, 2024

red031000 May 30, 2024

red031000 May 30, 2024

red031000 May 30, 2024

red031000 May 30, 2024

red031000 May 30, 2024

red031000 May 30, 2024

		}

		static inline void MTX_Copy44 (const MtxFx44 * pSrc, MtxFx44 * pDst) {

		void sub_020087A4(u32 *a0, int a1, int dy);
		void sub_02009264(UnkStruct_02009264 a0, struct UnkStruct_02072914_sub_sub a1);

Register Hall of Fame #313

Are you sure you want to change the base?

Register Hall of Fame #313

Conversation

PikalaxALT commented Apr 4, 2024

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

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

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