10000 More align SA1 and SA2 by JaceCear · Pull Request #203 · SAT-R/sa2 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

More align SA1 and SA2 #203

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

Merged
merged 18 commits into from
Feb 14, 2025
Merged

More align SA1 and SA2 #203

merged 18 commits into from
Feb 14, 2025

Conversation

JaceCear
Copy link
Collaborator

No description provided.

PAUSE_GRAPHICS_QUEUE();

#if (GAME == GAME_SA1)
if (!dm->playerPressedStart) {
CreateSegaLogo();
Copy link
Collaborator

Choose a reason for hiding this comment

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

We could possibly align these by calling them CreateTitleScreenIntro?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The title screen logo is something different.
The "Sonic Advance" banner is created separately from the background, if I'm not mistaken.
As it is, it's clear what we mean.

@@ -612,7 +617,7 @@ void SpawnMapEntities()
void Task_8008DCC(void)
{
#ifndef NON_MATCHING
struct Range *newRange2Ptr;
struct Range *newrange2Ptr;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why is this relabelled?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Maybe a search and replace error

character = &p->character;
memset(p->unk99, 0, sizeof(p->unk99));
{
u32 *ptr = (u32 *)(&p->SA2_LABEL(unk99)[0]);
Copy link
Collaborator
@freshollie freshollie Feb 13, 2025

Choose a reason for hiding this comment

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

You can probably remove the comment above with regard to the "actual" code

ring->unkC--;
}
}
}

#define USE_HITBOX_RECT 1
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do these need to be added back?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Well, they're still used. But of course I don't want to insert something that's not needed. ^^

playerID = &p->playerID;
character = &p->character;
u32 *ptr = (u32 *)(&p->SA2_LABEL(unk99)[0]);

s32 i = 4;
Copy link
Collaborator

Choose a reason for hiding this comment

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

This still isn't gonna work lol

@@ -794,9 +794,9 @@ void InitializePlayer(Player *p)
*u99_r6 = 0x7F;
#else
{
u32 *ptr = (u32 *)(&p->SA2_LABEL(unk99)[0]);
playerID = &p->playerID;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Also, if you really think this loop is real code, you might as well just wrap the if ((*playerID == 0) in non matches too and not use the pointers if you are not using the asm. The code you have here is like half way between a fake a real match.

#endif

#if (GAME == GAME_SA1)
p->acceleration = Q(8. / 256.);
Copy link
Collaborator

Choose a reason for hiding this comment

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

? Acceleration is the same?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yep.

Copy link
Collaborator
@freshollie freshollie left a comment

Choose a reason for hiding this comment

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

Minor point about acceleration being the same on both games apparently?

@JaceCear JaceCear merged commit 1bb658f into main Feb 14, 2025
15 checks passed
github-actions bot pushed a commit that referenced this pull request Feb 14, 2025
@JaceCear JaceCear deleted the more_align_1_and_2 branch February 17, 2025 15:37
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
0