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
5 changed files with 1056 additions and 1049 deletions
+1 -1
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;
+9 -2
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