Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Next PSP DRA file code-share #2274

Merged
merged 42 commits into from
Mar 2, 2025
Merged

Conversation

bismurphy
Copy link
Collaborator

This finishes out the DRA entities which is cool.

Will need to deconflict.

@bismurphy
Copy link
Collaborator Author

There we go! All errors resolved :)

src/dra/7E4BC.c Outdated
@@ -345,7 +343,8 @@ void func_8011E4BC(Entity* self) {
case 13:
tilePrim->posX.i.hi = selfXPos;
tilePrim->posY.i.hi = selfYPos;
tilePrim->velocityX.val = (rand() - 0x4000) >> 1;
tilePrim->velocityX.val =
(s32)((rand() & PSP_RANDMASK) - 0x4000) >> 1;
Copy link
Collaborator

Choose a reason for hiding this comment

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

FIX? 0x6000 in the next line too

src/dra/7E4BC.c Outdated

self->posY.i.hi += ((rand() % 35) - 15);
self->posX.i.hi += ((rand() % 20) - 10);
self->velocityY = -0x6000 - (rand() & 0x3FFF);
Copy link
Collaborator

Choose a reason for hiding this comment

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

FIX?

src/dra/7E4BC.c Outdated
self->ext.teleport.colorIntensity = 0x80;
self->ext.teleport.unk90 = 0xFF;
var_s5 = true;
self->step = Player_Hydrostorm;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Hydrostorm for Alucard?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

That's the enum we have now yeah, maybe I'll change it out.

src/dra/7E4BC.c Outdated
}
break;
case 6:
PLAYER.palette = 0x810D;
Copy link
Collaborator

Choose a reason for hiding this comment

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

PAL_OVL macro?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

will address this and the hydrostorm in a few hours :)

@bismurphy
Copy link
Collaborator Author

That should be everything handled now, as far as I can tell.

Copy link
Owner

@Xeeynamo Xeeynamo left a comment

Choose a reason for hiding this comment

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

Congrats, incredible job 👏

@bismurphy bismurphy merged commit 9c64892 into Xeeynamo:master Mar 2, 2025
27 checks passed
@bismurphy bismurphy deleted the next_psp_file branch March 2, 2025 21:15
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.

3 participants