Player animation offsets (#762)

* Changed PlayerAnimations to be named with offsets

* named hover boots timer

* update EnIshi sCylinderInits
This commit is contained in:
EllipticEllipsis 2021-04-10 17:07:25 +01:00 committed by GitHub
parent 3432a7d4b3
commit c04806fc66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1056 additions and 1049 deletions

File diff suppressed because it is too large Load Diff

View File

@ -348,7 +348,7 @@ typedef struct Player {
/* 0x0890 */ u8 unk_890;
/* 0x0891 */ u8 shockTimer;
/* 0x0892 */ u8 unk_892;
/* 0x0893 */ u8 unk_893;
/* 0x0893 */ u8 hoverBootsTimer;
/* 0x0894 */ s16 fallStartHeight; // last truncated Y position before falling
/* 0x0896 */ s16 fallDistance; // truncated Y distance the player has fallen so far (positive is down)
/* 0x0898 */ s16 unk_898;

View File

@ -1364,7 +1364,7 @@ u32 func_80091738(GlobalContext* globalCtx, u8* segment, SkelAnime* skelAnime) {
gSegments[4] = VIRTUAL_TO_PHYSICAL(segment + 0x3800);
gSegments[6] = VIRTUAL_TO_PHYSICAL(segment + 0x8800);
SkelAnime_InitLink(globalCtx, skelAnime, gPlayerSkelHeaders[(void)0, gSaveContext.linkAge], &gPlayer488Anim, 9, ptr,
SkelAnime_InitLink(globalCtx, skelAnime, gPlayerSkelHeaders[(void)0, gSaveContext.linkAge], &gPlayerAnim_003238, 9, ptr,
ptr, PLAYER_LIMB_MAX);
return size + 0x8890;

View File

@ -95,9 +95,16 @@ static ColliderCylinderInit sCylinderInits[] = {
OC2_TYPE_2,
COLSHAPE_CYLINDER,
},
{ 0x00, { 0x00000000, 0x00, 0x00 }, { 0x4FC1FFF6, 0x00, 0x00 }, 0x00, 0x01, 0x01 },
{
ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x4FC1FFF6, 0x00, 0x00 },
TOUCH_NONE,
BUMP_ON,
OCELEM_ON,
},
{ 55, 70, 0, { 0, 0, 0 } },
}
},
};
static CollisionCheckInfoInit sColChkInfoInit = { 0, 12, 60, MASS_IMMOVABLE };

File diff suppressed because it is too large Load Diff