mirror of
https://github.com/zeldaret/tmc
synced 2026-07-05 21:49:13 -04:00
Labeled one Portal Type and some animations
This commit is contained in:
@@ -554,7 +554,7 @@ void sub_080262A8(ChuchuBossEntity* this) {
|
||||
super->timer = 1;
|
||||
sub_080276F4(super, 6, 1);
|
||||
if (super->type2 == 0) {
|
||||
gPlayerState.animation = 0x104;
|
||||
gPlayerState.animation = ANIM_DOOR;
|
||||
this->unk_84->unk_03 = 1;
|
||||
} else {
|
||||
this->unk_7c = 0;
|
||||
|
||||
@@ -258,7 +258,7 @@ bool32 sub_0804AD18(void) {
|
||||
case 6:
|
||||
return FALSE;
|
||||
case 3:
|
||||
case 4:
|
||||
case PT_POT:
|
||||
case 5:
|
||||
default:
|
||||
return FALSE;
|
||||
|
||||
@@ -71,7 +71,7 @@ void sub_080768F8(ItemBehavior* this, u32 index) {
|
||||
if ((gPlayerState.flags & PL_MINISH) == 0) {
|
||||
this->timer = 0x10;
|
||||
} else {
|
||||
gPlayerState.animation = 0xc14;
|
||||
gPlayerState.animation = ANIM_C14;
|
||||
}
|
||||
sub_08077D38(this, index);
|
||||
sub_08076964(this, index);
|
||||
@@ -119,7 +119,7 @@ void sub_08076964(ItemBehavior* this, u32 index) {
|
||||
SetItemAnim(this, 0x104);
|
||||
return;
|
||||
} else {
|
||||
gPlayerState.animation = 0xc10;
|
||||
gPlayerState.animation = ANIM_C10;
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -69,7 +69,7 @@ void sub_08076758(ItemBehavior* this, u32 index) {
|
||||
gPlayerEntity.field_0x7a.HWORD = 2;
|
||||
gPlayerEntity.zVelocity = Q_16_16(2.0);
|
||||
gPlayerState.jump_status |= 0x10;
|
||||
gPlayerState.animation = 0x288;
|
||||
gPlayerState.animation = ANIM_ROCS_CAPE;
|
||||
SoundReq(SFX_172);
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -31,7 +31,7 @@ void sub_08075338(ItemBehavior* this, u32 index) {
|
||||
if (gPlayerState.flags & PL_MINISH) {
|
||||
this->priority |= 0x80;
|
||||
sub_08077D38(this, index);
|
||||
gPlayerState.animation = 0xc00;
|
||||
gPlayerState.animation = ANIM_SWORD_MINISH;
|
||||
SoundReq(SFX_PLY_VO1);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -122,7 +122,7 @@ void sub_0808C01C(JarPortalEntity* this, u32 r1) {
|
||||
gArea.portal_x = super->x.HALF.HI;
|
||||
gArea.portal_y = super->y.HALF.HI;
|
||||
gArea.portal_exit_dir = 2;
|
||||
type = 4;
|
||||
type = PT_POT;
|
||||
if (r1 != 0)
|
||||
type = 2;
|
||||
gArea.portal_type = type;
|
||||
|
||||
@@ -477,7 +477,7 @@ void sub_0809E1F0(KeyStealingTakkuriEntity* this) {
|
||||
|
||||
void sub_0809E210(KeyStealingTakkuriEntity* this) {
|
||||
gPlayerEntity.animationState = GetAnimationStateForDirection8(GetFacingDirection(&gPlayerEntity, super)) & 0xfe;
|
||||
gPlayerState.animation = 0x100;
|
||||
gPlayerState.animation = ANIM_DEFAULT;
|
||||
}
|
||||
|
||||
void sub_0809E238(KeyStealingTakkuriEntity* this) {
|
||||
|
||||
@@ -551,7 +551,7 @@ void sub_08085E74(LilypadLargeEntity* this) {
|
||||
gPlayerEntity.x.HALF.LO = 0;
|
||||
gPlayerEntity.y.HALF.LO = 0;
|
||||
gPlayerEntity.direction = super->direction;
|
||||
gPlayerState.animation = 0x100;
|
||||
gPlayerState.animation = ANIM_DEFAULT;
|
||||
gRoomControls.camera_target = super;
|
||||
if (gPlayerState.item != NULL) {
|
||||
DeleteEntity(gPlayerState.item);
|
||||
|
||||
+3
-3
@@ -1049,7 +1049,7 @@ static void PortalJumpOnUpdate(Entity* this) {
|
||||
this->subAction = 1;
|
||||
this->animationState = IdleSouth;
|
||||
this->spriteSettings.flipX = FALSE;
|
||||
if (gArea.portal_type == 4) {
|
||||
if (gArea.portal_type == PT_POT) {
|
||||
gPlayerState.animation = ANIM_ENTER_POT;
|
||||
}
|
||||
}
|
||||
@@ -1090,7 +1090,7 @@ static void PortalStandUpdate(Entity* this) {
|
||||
this->timer = 8;
|
||||
}
|
||||
|
||||
if (gArea.portal_type == 4) {
|
||||
if (gArea.portal_type == PT_POT) {
|
||||
if (this->frame == 0) {
|
||||
UpdateAnimationSingleFrame(this);
|
||||
return;
|
||||
@@ -2049,7 +2049,7 @@ static void PlayerRollInit(Entity* this) {
|
||||
if (playerFlags & PL_NO_CAP) {
|
||||
gPlayerState.animation = ANIM_ROLL_NOCAP;
|
||||
} else {
|
||||
gPlayerState.animation = 0x3a0;
|
||||
gPlayerState.animation = ANIM_ROLL;
|
||||
}
|
||||
}
|
||||
gPlayerState.flags |= PL_ROLLING;
|
||||
|
||||
+2
-2
@@ -1975,7 +1975,7 @@ void ResolvePlayerAnimation(void) {
|
||||
case 5:
|
||||
anim = ANIM_DEFAULT_NOCAP;
|
||||
break;
|
||||
case 4:
|
||||
case PT_POT:
|
||||
anim = ANIM_DEFAULT;
|
||||
break;
|
||||
default:
|
||||
@@ -2016,7 +2016,7 @@ void ResolvePlayerAnimation(void) {
|
||||
return;
|
||||
}
|
||||
if ((gPlayerState.flags & PL_USE_PORTAL) != 0) {
|
||||
anim = (gArea.portal_type == 4) ? 0x530 : 0x2c2;
|
||||
anim = (gArea.portal_type == PT_POT) ? ANIM_IN_POT : ANIM_PORTAL;
|
||||
} else {
|
||||
if (gPlayerState.sword_state != 0) {
|
||||
anim = ANIM_SWORD_CHARGE_END;
|
||||
|
||||
Reference in New Issue
Block a user