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.

Sign up for GitHub

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

Jump to bottom

Updated mario animation names and added automatic stashing #231

Merged
merged 3 commits into from
Jun 14, 2023
Merged

Updated mario animation names and added automatic stashing #231

merged 3 commits into from
Jun 14, 2023

Conversation

Lilaa3
Copy link
Collaborator

@Lilaa3 Lilaa3 commented Jun 14, 2023

No description provided.

thecozies
thecozies requested changes Jun 14, 2023
View reviewed changes
Copy link
Contributor

@thecozies thecozies left a comment

Choose a reason for hiding this comment

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

few lil things

fast64_internal/sm64/sm64_constants.py Outdated
( 5188592, "12 - Hand stand in tree"),
( 5196388, "13 - In tree?"),
( 5197436, "14 - Standing straight with arms out"),
( 5179584, "5 - Climbing up pool"),
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
( 5179584, "5 - Climbing up pool"),
( 5179584, "5 - Climbing up pole"),

fast64_internal/sm64/sm64_constants.py Outdated
( 5165520, "1 - Thrown from painting"),
( 5165544, "2 - Blown by wind"),
( 5172396, "3 - Dying on ground"),
( 5162640, "0 - Slow ledge grab"),
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
( 5162640, "0 - Slow ledge grab"),
( 5162640, "0 - Slow ledge climb up"),

something like this? or is this a grab when walking off a ledge

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

its MARIO_ANIM_SLOW_LEDGE_GRAB, it is not as far as I can see. change will be madeeee

fast64_internal/sm64/sm64_constants.py Outdated
( 5434636, "89 - Grab heavy object"),
( 5437964, "90 - Slow land from dive"),
( 5441520, "91 - Fly from canon"),
( 5442516, "92 - Move on wire net right"),
Copy link
Contributor

Choose a reason for hiding this comment

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

what's a wire net? I'm blanking

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Its an sm64 decomp moment MARIO_ANIM_MOVE_ON_WIRE_NET_RIGHT, maybe i should rename this to Moving right while hanging

Copy link
Contributor

Choose a reason for hiding this comment

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

lmaooo yeah that sounds good

fast64_internal/utility_anim.py Outdated
@@ -187,7 +206,6 @@ def utility_anim_register():
for cls in classes:
register_class(cls)


Copy link
Contributor

Choose a reason for hiding this comment

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

our formatter likes double newlines between functions, can you add this back in

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Idk how or why I did that lol but yeah

thecozies
thecozies reviewed Jun 14, 2023
View reviewed changes
fast64_internal/sm64/sm64_constants.py Outdated
( 5433276, "88 - Being grabbed"),
( 5434636, "89 - Grab heavy object"),
( 5437964, "90 - Slow land from dive"),
( 5441520, "91 - Fly from canon"),
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
( 5441520, "91 - Fly from canon"),
( 5441520, "91 - Fly from cannon"),

thecozies
thecozies reviewed Jun 14, 2023
View reviewed changes
fast64_internal/sm64/sm64_constants.py Outdated
( 5442516, "92 - Move on wire net right"),
( 5444052, "93 - Move on wire net left"),
( 5445472, "94 - Missing cap"),
( 5457860, "95 - Pool door walk in"),
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
( 5457860, "95 - Pool door walk in"),
( 5457860, "95 - Pull door walk in"),

thecozies
thecozies reviewed Jun 14, 2023
View reviewed changes
fast64_internal/sm64/sm64_constants.py Outdated
( 5635976, "165 - Drowning part 1"),
( 5641400, "166 - Drowning part 2"),
( 5646324, "167 - Dying in water"),
( 5649660, "168 - Foward kb in water"),
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
( 5649660, "168 - Foward kb in water"),
( 5649660, "168 - Forward kb in water"),

thecozies
thecozies reviewed Jun 14, 2023
View reviewed changes
fast64_internal/sm64/sm64_constants.py Outdated
( 5728744, "204 - Start wallkick"),
( 5730404, "205 - Star dance"),
( 5735864, "206 - Return from star dance"),
( 5737600, "207 - Fowards spinning flip"),
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
( 5737600, "207 - Fowards spinning flip"),
( 5737600, "207 - Forwards spinning flip"),

thecozies
thecozies reviewed Jun 14, 2023
View reviewed changes
Copy link
Contributor

@thecozies thecozies left a comment

Choose a reason for hiding this comment

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

couple fo[r]wards (btw you can add the changes from the review directly if you want)

fast64_internal/sm64/sm64_constants.py Outdated
( 5293488, "42 - Wing cap flying"),
( 5295016, "43 - Hang on owl"),
( 5296876, "44 - Land on stomach"),
( 5296900, "45 - Air foward kb"),
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
( 5296900, "45 - Air foward kb"),
( 5296900, "45 - Air forward kb"),

fast64_internal/sm64/sm64_constants.py Outdated
( 5408312, "78 - Land from single jump"),
( 5411044, "79 - Air kick"),
( 5412900, "80 - Double jump rise"),
( 5413596, "81 - Start foward spinning"),
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
( 5413596, "81 - Start foward spinning"),
( 5413596, "81 - Start forward spinning"),

fast64_internal/sm64/sm64_constants.py Outdated
( 5395248, "70 - Stand up from sliding with light object"),
( 5396716, "71 - Riding shell"),
( 5397832, "72 - Walking"),
( 5403208, "73 - Foward flip"),
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
( 5403208, "73 - Foward flip"),
( 5403208, "73 - Forward flip"),

fast64_internal/sm64/sm64_constants.py Outdated
( 5528568, "121 - Electrocution"),
( 5532480, "122 - Shocked"),
( 5533160, "123 - Backward kb"),
( 5535796, "124 - Foward kb"),
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
( 5535796, "124 - Foward kb"),
( 5535796, "124 - Forward kb"),

thecozies
thecozies approved these changes Jun 14, 2023
View reviewed changes
Copy link
Contributor

@thecozies thecozies left a comment

Choose a reason for hiding this comment

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

LFG

@thecozies thecozies merged commit 1641160 into Fast-64:main Jun 14, 2023
@Lilaa3 Lilaa3 deleted the fixed_mario_animation_names branch August 24, 2024 11:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thecozies thecozies thecozies approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Lilaa3 @thecozies