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

Name some more functions in common.c

Browse Source
This commit is contained in:
Catobat
2023-01-08 15:01:18 +01:00
parent 1d2d1cd786
commit 4ab73f8eb7
17 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/cucco.c
+1 -1
View File
@@ -112,7 +112,7 @@ void sub_0806E65C(Entity* this) {
void Cucco_ShowMessage(Entity* this) {
u32 val = 0;
u32 index = sub_08002632(this);
u32 index = GetFuserId(this);
if (gSave.fuserOffers[index] == 0xf3) {
val = 1;
}
src/npc/din.c
+1 -1
View File
@@ -31,7 +31,7 @@ void Din(Entity* this) {
void sub_08064828(Entity* this) {
u32 tmp = sub_0801E99C(this);
if ((gSave.fuserProgress[sub_08002632(this)] != 0) && (gSave.global_progress < 7)) {
if ((gSave.fuserProgress[GetFuserId(this)] != 0) && (gSave.global_progress < 7)) {
tmp = 0;
}
sub_08078784(this, tmp);
src/npc/farore.c
+1 -1
View File
@@ -31,7 +31,7 @@ void Farore(Entity* this) {
void sub_08064A28(Entity* this) {
u32 tmp = sub_0801E99C(this);
if ((gSave.fuserProgress[sub_08002632(this)] != 0) && (gSave.global_progress < 7)) {
if ((gSave.fuserProgress[GetFuserId(this)] != 0) && (gSave.global_progress < 7)) {
tmp = 0;
}
sub_08078784(this, tmp);
src/npc/hurdyGurdyMan.c
+1 -1
View File
@@ -26,7 +26,7 @@ void HurdyGurdyMan(Entity* this) {
this->interactType = 0;
this->field_0x68.HALF.HI = this->animIndex;
InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)));
index = sub_08002632(this);
index = GetFuserId(this);
pointerToArray = gUnk_08001A7C[index];
if (this->field_0x68.HALF.LO == 0x32) {
pointerToArray = pointerToArray + 3;
src/npc/nayru.c
+1 -1
View File
@@ -31,7 +31,7 @@ void Nayru(Entity* this) {
void sub_08064928(Entity* this) {
u32 tmp = sub_0801E99C(this);
if ((gSave.fuserProgress[sub_08002632(this)] != 0) && (gSave.global_progress < 7)) {
if ((gSave.fuserProgress[GetFuserId(this)] != 0) && (gSave.global_progress < 7)) {
tmp = 0;
}
sub_08078784(this, tmp);
src/npc/percy.c
+1 -1
View File
@@ -71,7 +71,7 @@ void sub_0806B41C(Entity* this) {
this->action = 2;
this->interactType = 0;
InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)) + 4);
idx = sub_08002632(this);
idx = GetFuserId(this);
tmp = gUnk_08001A7C[idx];
if (this->field_0x68.HALF.LO == 33)
tmp += 3;
src/npc/tingleSiblings.c
+1 -1
View File
@@ -134,7 +134,7 @@ void sub_08064F28(Entity* this, ScriptExecutionContext* context) {
context->condition = 0;
roomFlag = gUnk_0810FC50[this->type];
if (CheckRoomFlag(roomFlag) == 0) {
bVar2 = gSave.fuserProgress[sub_08002632(this)];
bVar2 = gSave.fuserProgress[GetFuserId(this)];
if (bVar2 >= 2) {
uVar5 = 3;
} else {