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

merge from upstream #104

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

merge from upstream #104

wants to merge 14 commits into from

Conversation

z64a
Copy link
Collaborator

@z64a z64a commented Oct 23, 2024

No description provided.

@z64a z64a marked this pull request as draft October 24, 2024 03:44
@z64a z64a marked this pull request as ready for review October 31, 2024 00:46
Copy link
Owner

@bates64 bates64 left a comment

Choose a reason for hiding this comment

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

Good and nice PR :)

Ditto for all action command header comments. It renders with doxygen, and later we can use the param info for a language server/similar.

/* 0x083 */ s8 actionCommandMode;
/* 0x084 */ s8 actionQuality; // actionCommandVar1 ?
Copy link
Owner

Choose a reason for hiding this comment

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

This rename is likely to cause very subtle problems (actionQuality changing meaning). We should be sure to let users know of it if they've touched action command code

AC_DIFFICULTY_4 = 4, // harder
AC_DIFFICULTY_5 = 5, // hard
AC_DIFFICULTY_6 = 6, // very hard
AC_DIFFICULTY_7 = 7, // hardest
Copy link
Owner

Choose a reason for hiding this comment

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

Maybe worth renaming these upstream to AC_DIFFICULTY_HARDEST etc? Unless there's a good reason not to that I'm missing

@@ -3,10 +3,19 @@

#include "common_structs.h"

// args: none
Copy link
Owner

Choose a reason for hiding this comment

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

should use // @evtapi

API_CALLABLE(action_command_body_slam_init);

// args: prep time, duration, difficulty, variation
Copy link
Owner

Choose a reason for hiding this comment

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

should use // @param

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