mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-27 02:35:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into m

Browse Source
This commit is contained in:
theo3
2021-11-05 01:58:55 -07:00
parent 9cfbb3a27a 90ed4a86ce
commit a9bb5184d0
440 changed files with 7319 additions and 11526 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/castleMaid.c
+2 -2
View File
@@ -97,13 +97,13 @@ void sub_0806464C(Entity* this) {
s32 tmp;
if (CheckGlobalFlag(0x15) != 0) {
tmp = 2;
#if defined(JP) || defined(EU)
#if defined(JP) || defined(EU) || defined(DEMO_JP)
} else if (CheckLocalFlag(0x9f) == 0) {
#else
} else if (CheckLocalFlag(0xa0) == 0) {
#endif
tmp = 0;
#if defined(JP) || defined(EU)
#if defined(JP) || defined(EU) || defined(DEMO_JP)
SetLocalFlag(0x9f);
#else
SetLocalFlag(0xa0);
src/npc/castorWildsStatue.c
+1 -1
View File
@@ -59,7 +59,7 @@ void sub_08067418(Entity* this) {
this->spriteOrientation.flipY = 1;
this->spriteRendering.b3 = 1;
this->spritePriority.b0 = 2;
#if defined(JP) || defined(EU)
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (CheckLocalFlag(0x1e) == 0) {
#else
if (CheckLocalFlag(0x1d) == 0) {
src/npc/dog.c
+8 -8
View File
@@ -45,7 +45,7 @@ void sub_08069B44(Entity* this) {
u32 sVar3;
u32 uVar4;
u32 uVar5;
if (sub_08069EF0() != 0) {
if (sub_08069EF0(this) != 0) {
uVar5 = sub_0805ACC0(this);
if (uVar5 == 0) {
sVar3 = this->x.HALF.HI;
@@ -74,7 +74,7 @@ void sub_08069B44(Entity* this) {
if (((this->type == 0) && ((gPlayerState.flags & 0x80) == 0)) && (GetInventoryValue(0x36) != 2)) {
this->action = 4;
}
#if defined(JP) || defined(EU)
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if ((this->type == 2) && (CheckLocalFlag(0xcc) == 0)) {
#else
if ((this->type == 2) && (CheckLocalFlag(0xcf) == 0)) {
@@ -270,7 +270,7 @@ void sub_08069F6C(Entity* this) {
}
u32 sub_08069F90(Entity* this) {
#if defined(JP) || defined(EU)
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if ((this->type == 2) && (CheckLocalFlag(0xcc) == 0)) {
#else
if ((this->type == 2) && (CheckLocalFlag(0xcf) == 0)) {
@@ -328,13 +328,13 @@ void sub_0806A0A4(Entity* this) {
if ((gPlayerState.flags & 0x80) != 0) {
dialog = 4;
#if defined(JP) || defined(EU)
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (CheckLocalFlag(0xcc) == 0) {
#else
if (CheckLocalFlag(0xcf) == 0) {
#endif
dialog = 3;
#if defined(JP) || defined(EU)
#if defined(JP) || defined(EU) || defined(DEMO_JP)
SetLocalFlag(0xcc);
#else
SetLocalFlag(0xcf);
@@ -344,19 +344,19 @@ void sub_0806A0A4(Entity* this) {
} else {
dialog = 2;
#if defined(JP) || defined(EU)
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (CheckLocalFlag(0xcc) == 0) {
#else
if (CheckLocalFlag(0xcf) == 0) {
#endif
dialog = 1;
#if defined(JP) || defined(EU)
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (CheckLocalFlag(0xd8) == 0) {
#else
if (CheckLocalFlag(0xdb) == 0) {
#endif
dialog = 0;
#if defined(JP) || defined(EU)
#if defined(JP) || defined(EU) || defined(DEMO_JP)
SetLocalFlag(0xd8);
#else
SetLocalFlag(0xdb);
src/npc/gina.c
+1 -1
View File
@@ -29,7 +29,7 @@ void Gina(Entity* this) {
case 2:
if (UpdateFuseInteraction(this) != 0) {
this->action = 1;
#if defined(USA) || defined(DEMO)
#if defined(USA) || defined(DEMO_USA)
SetLocalFlag(0x88);
#endif
}
src/npc/npc4E.c
+6 -6
View File
@@ -105,35 +105,35 @@ void sub_0806DAD0(Entity* this) {
void sub_0806DAE8(Entity* this) {
switch (this->type - 1) {
case 0:
#if defined(JP) || defined(EU)
#if defined(JP) || defined(EU) || defined(DEMO_JP)
SetLocalFlag(0xeb);
#else
SetLocalFlag(0xee);
#endif
break;
case 1:
#if defined(JP) || defined(EU)
#if defined(JP) || defined(EU) || defined(DEMO_JP)
SetLocalFlag(0xec);
#else
SetLocalFlag(0xef);
#endif
break;
case 2:
#if defined(JP) || defined(EU)
#if defined(JP) || defined(EU) || defined(DEMO_JP)
SetLocalFlag(0xed);
#else
SetLocalFlag(0xf0);
#endif
break;
case 3:
#if defined(JP) || defined(EU)
#if defined(JP) || defined(EU) || defined(DEMO_JP)
SetLocalFlag(0xee);
#else
SetLocalFlag(0xf1);
#endif
break;
case 4:
#if defined(JP) || defined(EU)
#if defined(JP) || defined(EU) || defined(DEMO_JP)
SetLocalFlag(0xef);
#else
SetLocalFlag(0xf2);
@@ -147,7 +147,7 @@ void sub_0806DAE8(Entity* this) {
void sub_0806DB44(Entity* this, ScriptExecutionContext* context) {
context->condition = 0;
#if defined(JP) || defined(EU)
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (CheckLocalFlag(0xeb) != 0 && CheckLocalFlag(0xec) != 0 && CheckLocalFlag(0xed) != 0 &&
CheckLocalFlag(0xee) != 0 && CheckLocalFlag(0xef) != 0) {
#else