mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-20 14:15:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

framestate, ezlo hint

Browse Source
This commit is contained in:
theo3
2021-12-20 23:11:22 -08:00
parent 40b2a30c1c
commit cb95bdb96a
31 changed files with 326 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/beetle.c
+2 -2
View File
@@ -25,7 +25,7 @@ void sub_08021768(Entity* this) {
void sub_08021780(Entity* this) {
switch (this->bitfield) {
case 0x80:
if (gPlayerState.field_0xa8 == 24) {
if (gPlayerState.framestate == PL_STATE_CLIMB) {
sub_08021768(this);
} else {
this->action = 5;
@@ -219,7 +219,7 @@ void sub_08021B64(Entity* this) {
InitializeAnimation(this, 2);
} else {
int iVar4 = 1;
if (gPlayerState.field_0xa8 != 11 && gPlayerState.field_0xa8 != 20) {
if (gPlayerState.framestate != PL_STATE_JUMP && gPlayerState.framestate != PL_STATE_CAPE) {
if (sub_0807953C())
iVar4 = this->type * 3 + 8;
src/enemy/vaatiWrath.c
+2 -2
View File
@@ -998,13 +998,13 @@ void VaatiWrathType0PreAction(Entity* this) {
if (gSave.unk48C[3] != 0) {
gSave.unk48C[3]--;
} else {
temp = gPlayerState.field_0xa9;
temp = gPlayerState.framestate_last;
if (temp < 2) {
if (temp >= 0) {
if (gPlayerState.field_0x2c == NULL) {
if (gPlayerEntity.field_0x7a.HWORD == 0) {
if ((gPlayerEntity.z.HALF.HI & 0x8000U) == 0 || (gPlayerState.field_0xa != 0)) {
sub_08078AA8(0xb70, 0);
CreateEzloHint(0xb70, 0);
gScreenTransition.field_0x38 |= 2;
}
}