Skip to content

Match P2/ub and P2/sb - #288

Open
SlyC00per wants to merge 14 commits into
TheOnlyZac:mainfrom
SlyC00per:match-p2-ub-and-p2-sb
Open

SlyC00per wants to merge 14 commits into
TheOnlyZac:mainfrom
SlyC00per:match-p2-ub-and-p2-sb

Conversation

@SlyC00per

Copy link
Copy Markdown
Contributor

ub (Underwater Boss aka Raleigh)
sb (Snow Boss aka Panda King)

sha1sum config/checksum.sha1 out/SCUS_971.98: OK

@TheOnlyZac TheOnlyZac left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Took a quick look over everything except sb.c and ub.c, I'll have to come back for those later.

Comment thread include/basic.h Outdated
/* 0x00 */ VTCAMSEN *pvtcamsen;
/* 0x00 */ VTPRSEN *pvtprsen;
/* 0x00 */ VTEXPL *pvtexpl;
/* 0x00 */ struct VTSTEPGUARD *pvtstepguard;

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replace struct VTSTEPGUARD with just VTSTEPGUARD.

Comment thread include/vec.h Outdated
Comment on lines +183 to +223
static inline void NormalizeVector(VECTOR *pvecOut, const VECTOR *pvecIn, const VECTOR *pvecDefault)
{
asm (
".set push\n"
".set noreorder\n"
".set noat\n"
"lqc2 $vf3, %1\n"
"vmul.xyz $vf1, $vf3, $vf3\n"
"vaddw.x $vf2, $vf0, $vf0w\n"
"vadday.x ACC, $vf1, $vf1y\n"
"vmaddz.x $vf1, $vf2, $vf1z\n"
"lui $1, (0x38D1B717 >> 16)\n"
"ori $1, $1, (0x38D1B717 & 0xFFFF)\n"
"mtc1 $1, $f1\n"
".word 0x4A0103BD\n"
"vwaitq\n"
"vaddq.x $vf1, $vf0, Q\n"
"lq $4, -16+%1\n"
"qmfc2.ni $3, $vf1\n"
"addiu $2, $2, %%lo(g_normalX)\n"
"mtc1 $3, $f0\n"
"lq $2, 0($2)\n"
"c.lt.s $f0, $f1\n"
"addiu $3, $0, 6\n"
"sq $4, 16+%0\n"
"bc1f 1f\n"
"sw $3, -16+%0\n"
"b 2f\n"
"qmtc2.ni $2, $vf1\n"
"1:\n"
"vdiv Q, $vf0w, $vf1x\n"
"vwaitq\n"
"vmulq.xyzw $vf1, $vf3, Q\n"
"2:\n"
"sqc2 $vf1, %0\n"
".set pop\n"
: "=m"(*pvecOut)
: "m"(*pvecIn), "m"(*pvecDefault)
: "$1", "$3", "$4", "$f0", "$f1", "memory"
);
}

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this.

Comment thread include/screen.h Outdated
void FUN_001abe70(BLOT *pblot);

void FUN_001ac060(BLOT *pblot);
extern "C" void FUN_001ac060(BLOT *pblot);

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function is most likely not C.

Comment thread include/vtables.h
Comment on lines +84 to +94
struct EXPL;
struct EXPLSO;

/**
* @brief VT for EXPL objects.
*/
struct VTEXPL : VTLO
{
void (*pfnExplodeExplExplso)(EXPL *, EXPLSO *);
};

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you move this down below VTALO and VTSO.

Comment thread include/xform.h Outdated
// ...
/* 0x00 */ GRFEXPLSO grfexplso;
/* 0x04 */ ALO *paloReference;
/* 0x08 */ STRUCT_PADDING(2); // padding to 16 bytes for VECTOR

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No longer needed since #285

Comment thread include/xform.h Outdated
struct EXPLO;
struct EXPLS;
struct EXPLSO;
typedef int GRFEXPLSO;

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typedef incorrectly mixed in with forward struct declarations

This branch is waiting to be deployed

1 waiting deployment
pr-build — 36f86864 Waiting Oct 27, 2026 by SlyC00per via build-objects #93
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants