mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-30 11:51:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use PlayerActions enum in several places

Browse Source
This commit is contained in:
Tal Hayon
2022-01-29 15:43:09 +02:00
parent fd9049f598
commit b34067cb0b
9 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/npc23.c
+2 -2
View File
@@ -64,7 +64,7 @@ void nullsub_110(void) {
void sub_080663D4(Entity* this) {
if (this->x.HALF.HI == this->field_0x7c.HALF_U.HI - 8) {
if (gPlayerEntity.action != 0xf) {
if (gPlayerEntity.action != PLAYER_080720DC) {
this->action = 4;
this->direction = 0;
this->speed = 0;
@@ -95,7 +95,7 @@ void sub_0806643C(Entity* this) {
}
void sub_08066474(void) {
if (gPlayerEntity.action != 0xf) {
if (gPlayerEntity.action != PLAYER_080720DC) {
gUnk_02034490[0] = 0;
}
}
src/npc/percy.c
+1 -1
View File
@@ -132,7 +132,7 @@ void sub_0806B540(Entity* this) {
}
break;
case 3:
if ((gPlayerEntity.action != 8)) {
if ((gPlayerEntity.action != PLAYER_ITEMGET)) {
context->wait = 0x2d;
return;
}
src/npc/stockwell.c
+1 -1
View File
@@ -105,7 +105,7 @@ void sub_080652E4(Entity* this) {
if (this->actionDelay != 0) {
this->actionDelay -= 1;
} else {
if (gPlayerEntity.action != 8) {
if (gPlayerEntity.action != PLAYER_ITEMGET) {
this->subAction += 1;
MessageNoOverlap(0x2c19, this);
}