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

Dec 2023 - Jan 2024 #171

Merged
merged 18 commits into from
Jan 30, 2024
Merged

Dec 2023 - Jan 2024 #171

merged 18 commits into from
Jan 30, 2024

Conversation

SethBarberee
Copy link
Collaborator

Finally getting around to the PR. Mix of stuff with Traps and other random things.

asm/code_80521D0.s Outdated Show resolved Hide resolved
@@ -4800,7 +4800,7 @@ _08054E0C:
adds r1, r5, 0
mov r2, r8
mov r3, r9
bl TrapperOrbAction
bl SpikesMoveAction
Copy link
Collaborator

Choose a reason for hiding this comment

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

There are trailing spaces in a couple of places within the ASM. Perhaps a bad find/replace?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Hmm probably. Will check the rest of these

@SethBarberee SethBarberee merged commit ed83438 into pret:master Jan 30, 2024
1 check passed
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