Skip to content

Correction: Oversights in CHARACTER_ANIMATIONS #91

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

Merged
merged 1 commit into from
May 5, 2025
Merged

Correction: Oversights in CHARACTER_ANIMATIONS #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions SA2ModLoader/include/SA2Enums.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2847,15 +2847,15 @@ enum class eAL_MOTION : int
// Flags for sp_info
enum SP_FLAG
{
SP_FLAG_BLEND_ONE = 0x1,
SP_FLAG_BLEND_SRC = 0x2,
SP_FLAG_USE_ALPHA = 0x8, /* Set alpha pipeline */
SP_FLAG_10 = 0x10,
SP_FLAG_20 = 0x20,
SP_FLAG_40 = 0x40,
SP_FLAG_BLEND_ONE = 0x1,
SP_FLAG_BLEND_SRC = 0x2,
SP_FLAG_USE_ALPHA = 0x8, /* Set alpha pipeline */
SP_FLAG_10 = 0x10,
SP_FLAG_20 = 0x20,
SP_FLAG_40 = 0x40,
SP_FLAG_COLOR_FILTER = 0x80, /* Multiply sprite color with white color (useless) */
SP_FLAG_USE_OFFSET = 0x100, /* Wheter or not to use the offset value of a particule */
SP_FLAG_400 = 0x400
SP_FLAG_USE_OFFSET = 0x100, /* Wheter or not to use the offset value of a particule */
SP_FLAG_400 = 0x400
};

// Flags for sp_task
Expand Down Expand Up @@ -3616,9 +3616,9 @@ enum CHARACTER_ANIMATIONS
SONIC_ATTACK = 118,
SONIC_INTRO_POSE = 119,
SONIC_INTRO_IDLE = 120,
SP_B_SONIC_BOARD_TRICK_NICE = 143,
SP_B_SONIC_BOARD_TRICK_COOL = 144,
SP_B_SONIC_BOARD_TRICK_AWESOME = 145,
SP_B_SONIC_BOARD_TRICK_NICE = 142,
SP_B_SONIC_BOARD_TRICK_COOL = 143,
SP_B_SONIC_BOARD_TRICK_AWESOME = 144,
SP_B_BOARD_SONIC_TRICK_NICE = 157,
SP_B_BOARD_SONIC_TRICK_COOL = 158,
SP_B_BOARD_SONIC_TRICK_AWESOME = 159,
Expand Down Expand Up @@ -3889,7 +3889,7 @@ enum CHARACTER_ANIMATIONS
MECHTAILS_INTRO_IDLE = 188,
SP_MECHTAILS_QUICKSAND = 189,


// Mechless Tails Animations

TAILS_IDLE1 = 87,
Expand Down Expand Up @@ -4087,6 +4087,13 @@ enum CHARACTER_ANIMATIONS
AMY_FALL = 234,
AMY_LAND_HIGH = 238,

SP_B_AMY_BOARD_TRICK_NICE = 139,
SP_B_AMY_BOARD_TRICK_COOL = 140,
SP_B_AMY_BOARD_TRICK_AWESOME = 141,
SP_B_AMY_SHADOW_TRICK_NICE = 163,
SP_B_AMY_SHADOW_TRICK_COOL = 164,
SP_B_AMY_SHADOW_TRICK_AWESOME = 165,


// Metal Sonic Animations

Expand All @@ -4110,6 +4117,13 @@ enum CHARACTER_ANIMATIONS
METAL_BLACKSHIELD_ENGAGE = 243,
METAL_BLACKSHIELD_ANIM = 244,

SP_B_METAL_BOARD_TRICK_NICE = 136,
SP_B_METAL_BOARD_TRICK_COOL = 137,
SP_B_METAL_BOARD_TRICK_AWESOME = 138,
SP_B_METAL_SHADOW_TRICK_NICE = 160,
SP_B_METAL_SHADOW_TRICK_COOL = 161,
SP_B_METAL_SHADOW_TRICK_AWESOME = 162,


// Tikal Animations

Expand Down