falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Had a wrong name for an animation

This commit is contained in:
Reinmmar 2023-09-19 09:56:29 +02:00
parent b4cf2f7a92
commit 20483c258a
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/player.h
View File

@ -284,7 +284,7 @@ typedef enum {
typedef enum { typedef enum {
ANIM_DEFAULT = 0x100, ANIM_DEFAULT = 0x100,
ANIM_DOOR = 0x104, ANIM_WALK = 0x104,
ANIM_BOUNCE = 0x114, ANIM_BOUNCE = 0x114,
ANIM_SHIELD = 0x160, ANIM_SHIELD = 0x160,
ANIM_SHIELD_END = 0x164, ANIM_SHIELD_END = 0x164,
@ -337,7 +337,7 @@ typedef enum {
ANIM_EZLO_EYES_MIDDLE = 0x3cc, ANIM_EZLO_EYES_MIDDLE = 0x3cc,
ANIM_EZLO_LEAVE_RIGHT = 0x3cd, ANIM_EZLO_LEAVE_RIGHT = 0x3cd,
ANIM_DEFAULT_NOCAP = 0x400, ANIM_DEFAULT_NOCAP = 0x400,
ANIM_DOOR_NOCAP = 0x404, ANIM_WALK_NOCAP = 0x404,
ANIM_SHIELD_NOCAP = 0x410, ANIM_SHIELD_NOCAP = 0x410,
ANIM_SHIELD_END_NOCAP = 0x414, ANIM_SHIELD_END_NOCAP = 0x414,
ANIM_PORTAL_LEAVE_NOCAP = 0x41c, ANIM_PORTAL_LEAVE_NOCAP = 0x41c,

2
src/enemy/chuchuBoss.c
View File

@ -554,7 +554,7 @@ void sub_080262A8(ChuchuBossEntity* this) {
super->timer = 1; super->timer = 1;
sub_080276F4(super, 6, 1); sub_080276F4(super, 6, 1);
if (super->type2 == 0) { if (super->type2 == 0) {
gPlayerState.animation = ANIM_DOOR; gPlayerState.animation = ANIM_WALK;
this->unk_84->unk_03 = 1; this->unk_84->unk_03 = 1;
} else { } else {
this->unk_7c = 0; this->unk_7c = 0;

16
src/player.c
View File

@ -1461,7 +1461,7 @@ static void PlayerPushEnd(Entity* this) {
// Final push? // Final push?
this->subtimer = 6; this->subtimer = 6;
if ((gPlayerState.flags & PL_MINISH) == 0) { if ((gPlayerState.flags & PL_MINISH) == 0) {
gPlayerState.animation = ANIM_DOOR; gPlayerState.animation = ANIM_WALK;
this->spriteIndex = 3; this->spriteIndex = 3;
InitAnimationForceUpdate(this, (this->animationState >> 1) + 0x3c); InitAnimationForceUpdate(this, (this->animationState >> 1) + 0x3c);
} }
@ -1790,9 +1790,9 @@ static void sub_08072100(Entity* this) {
this->direction = DIR_NONE; this->direction = DIR_NONE;
if (gPlayerState.flags & PL_NO_CAP) { if (gPlayerState.flags & PL_NO_CAP) {
gPlayerState.animation = ANIM_DOOR_NOCAP; gPlayerState.animation = ANIM_WALK_NOCAP;
} else { } else {
gPlayerState.animation = ANIM_DOOR; gPlayerState.animation = ANIM_WALK;
} }
ResetActiveItems(); ResetActiveItems();
sub_08072168(this); sub_08072168(this);
@ -1988,7 +1988,7 @@ static void sub_080724DC(Entity* this) {
if (gPlayerState.flags & PL_MINISH) { if (gPlayerState.flags & PL_MINISH) {
gPlayerState.animation = ANIM_BOUNCE_MINISH; gPlayerState.animation = ANIM_BOUNCE_MINISH;
} else { } else {
gPlayerState.animation = ANIM_DOOR; gPlayerState.animation = ANIM_WALK;
} }
this->direction = Direction8FromAnimationState(this->animationState); this->direction = Direction8FromAnimationState(this->animationState);
} }
@ -2602,9 +2602,9 @@ static void sub_080731D8(Entity* this) {
SetZeldaFollowTarget(this); SetZeldaFollowTarget(this);
} }
if (gPlayerState.flags & PL_NO_CAP) { if (gPlayerState.flags & PL_NO_CAP) {
gPlayerState.animation = ANIM_DOOR_NOCAP; gPlayerState.animation = ANIM_WALK_NOCAP;
} else { } else {
gPlayerState.animation = ANIM_DOOR; gPlayerState.animation = ANIM_WALK;
} }
gRoomControls.camera_target = NULL; gRoomControls.camera_target = NULL;
DeleteClones(); DeleteClones();
@ -3851,9 +3851,9 @@ void sub_08074D34(Entity* this, ScriptExecutionContext* ctx) {
break; break;
case 0x2: case 0x2:
if (gPlayerState.flags & PL_NO_CAP) if (gPlayerState.flags & PL_NO_CAP)
gPlayerState.animation = ANIM_DOOR_NOCAP; gPlayerState.animation = ANIM_WALK_NOCAP;
else else
gPlayerState.animation = ANIM_DOOR; gPlayerState.animation = ANIM_WALK;
break; break;
case 0x4: case 0x4:
break; break;

8
src/playerUtils.c
View File

@ -1578,8 +1578,8 @@ void sub_08079064(Entity* this) {
} else if ((gPlayerState.swim_state & 0x80) != 0) { } else if ((gPlayerState.swim_state & 0x80) != 0) {
gPlayerState.animation = ANIM_DIVE; gPlayerState.animation = ANIM_DIVE;
} else { } else {
if (gPlayerState.animation == ANIM_LANTERN || gPlayerState.animation == ANIM_DOOR || if (gPlayerState.animation == ANIM_LANTERN || gPlayerState.animation == ANIM_WALK ||
gPlayerState.animation == ANIM_DOOR_NOCAP) { gPlayerState.animation == ANIM_WALK_NOCAP) {
sub_080790E4(this); sub_080790E4(this);
} }
} }
@ -1881,7 +1881,7 @@ void sub_080797EC(void) {
if (gPlayerState.framestate == PL_STATE_IDLE) { if (gPlayerState.framestate == PL_STATE_IDLE) {
gPlayerState.framestate = PL_STATE_WALK; gPlayerState.framestate = PL_STATE_WALK;
} }
animation = ANIM_DOOR_NOCAP; animation = ANIM_WALK_NOCAP;
} else { } else {
animation = ANIM_SWORD_CHARGE; animation = ANIM_SWORD_CHARGE;
if (sub_080793E4(0)) { if (sub_080793E4(0)) {
@ -1931,7 +1931,7 @@ void sub_080797EC(void) {
if ((gPlayerState.flags & PL_USE_LANTERN) != 0) { if ((gPlayerState.flags & PL_USE_LANTERN) != 0) {
animation = ANIM_LANTERN; animation = ANIM_LANTERN;
} else { } else {
animation = ANIM_DOOR; animation = ANIM_WALK;
} }
} }
} }