mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-05-31 09:22:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

updated flag func calls

Browse Source
This commit is contained in:
theo3
2020-07-18 16:03:20 -07:00
parent cce6a23fbb
commit c084cfbae2
11 changed files with 46 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/forestMinish.c
+6 -6
View File
@@ -155,7 +155,7 @@ void sub_080601D4(Entity* this) {
u32 temp;
u32 uVar2;
if (CheckGlobalFlag(4) == 0) {
if (CheckGlobalFlag(LV3_CLEAR) == 0) {
uVar2 = 2;
} else {
temp = CheckKinstoneFused(0x17);
@@ -202,9 +202,9 @@ void sub_08060270(Entity *this)
//flippers
if (GetInventoryValue(0x46) == 0) {
index = 1;
if (CheckGlobalFlag(0x29) == 0) {
if (CheckGlobalFlag(MIZUKAKI_START) == 0) {
index = 0;
SetGlobalFlag(0x29);
SetGlobalFlag(MIZUKAKI_START);
}
}
else {
@@ -266,19 +266,19 @@ u32 sub_08060354(void)
s32 iVar2;
iVar2 = gUnk_02002A40.unk2 - gUnk_02002A40.unk3;
if (CheckGlobalFlag(0x3b) == 0) {
if (CheckGlobalFlag(DRUG_1) == 0) {
if (4 < iVar2) {
return 0x8444;
}
}
else {
if (CheckGlobalFlag(0x3c) == 0) {
if (CheckGlobalFlag(DRUG_2) == 0) {
if (iVar2 > 9) {
return 0x8444;
}
}
else {
if (CheckGlobalFlag(0x3d) == 0) {
if (CheckGlobalFlag(DRUG_3) == 0) {
if (iVar2 > 14) {
return 0x8444;
}
src/npc/mutoh.c
+1 -1
View File
@@ -67,7 +67,7 @@ void sub_080670B4(Entity *this)
uVar2 = 0;
if (GetInventoryValue(0x11) == 0) {
uVar1 = CheckGlobalFlag(0x15);
uVar1 = CheckGlobalFlag(TABIDACHI);
uVar2 = (-uVar1 | uVar1) >> 0x1f;
}
TextboxNoOverlap(gUnk_08110C0C[uVar2],this);
src/npc/simon.c
+1 -1
View File
@@ -49,7 +49,7 @@ void Simon_CreateChest(Entity *this)
void sub_0806C280(void)
{
SetGlobalFlag(0x50);
SetGlobalFlag(MAROYA_WAKEUP);
DoExitTransition(&gUnk_0813AD74);
gUnk_030010A0.unk = 6;
}
src/npc/townsperson.c
+1 -1
View File
@@ -283,7 +283,7 @@ void sub_0806200C(Entity* this) {
u32 index;
index = 0;
if ((CheckGlobalFlag(0x29) != 0) && (CheckLocalFlag(0x6b))) {
if ((CheckGlobalFlag(MIZUKAKI_START) != 0) && (CheckLocalFlag(0x6b))) {
// hyrule bestiary
if (GetInventoryValue(0x39) == 2) {
src/npc/windTribespeople.c
+2 -2
View File
@@ -52,7 +52,7 @@ void sub_0806C7D4(Entity* this) {
sub_0806F118(this);
} else {
sub_0807DD94(this, 0);
if ((this->entityType.parameter == 3) && (!CheckGlobalFlag(0x58)) && (CheckLocalFlag(0x63)) &&
if ((this->entityType.parameter == 3) && (!CheckGlobalFlag(WARP_EVENT_END)) && (CheckLocalFlag(0x63)) &&
(CheckRoomFlag(0))) {
(this->entityType).parameter = 7;
sub_0807DD80(this, &gUnk_08014A80);
@@ -130,7 +130,7 @@ void sub_0806C944(Entity *this)
int iVar1;
int iVar2;
iVar1 = CheckGlobalFlag(0x58);
iVar1 = CheckGlobalFlag(WARP_EVENT_END);
if (iVar1 == 0) {
iVar2 = 0;
}
src/npc/zelda.c
+1 -1
View File
@@ -84,7 +84,7 @@ void sub_08066D94(Entity* ent) {
u32 roomID;
Entity* npc;
SetGlobalFlag(0x1C);
SetGlobalFlag(ZELDA_CHASE);
npc = CreateNPC(0x2E, 0, 0);
if (npc != NULL) {
npc->animationState = gLinkEntity.animationState;