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

merge

Browse Source
This commit is contained in:
theo3
2021-12-27 18:23:03 -08:00
parent dc8bcb32e0 60e74d1ba9
commit ebaa6d76fa
687 changed files with 10774 additions and 9983 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/greatFairy.c
+1 -1
View File
@@ -183,7 +183,7 @@ void GreatFairy_WingsUpdate(Entity* this) {
this->action = 2;
sub_0805EC60(this);
gRoomVars.animFlags |= 32;
gActiveScriptInfo.unk_00 |= 4;
gActiveScriptInfo.syncFlags |= 4;
} else {
sub_0805EC9C(this, this->speed, 256, 0);
}
src/object/object6A.c
+9 -9
View File
@@ -16,10 +16,10 @@ extern s16 gUnk_08122B0E[];
extern u16 gUnk_08122B1E[];
extern s8 gUnk_08122B2E[];
extern u16 script_0800AEDC;
extern u16 script_0801183C;
extern u16 script_Object6ATheLittleHat;
extern u16 script_Object6ASwordInChest;
extern u16 script_08015B14;
extern u16 script_08011940;
extern u16 script_ZeldaMagic;
extern u16 script_08012C48;
typedef struct {
@@ -186,7 +186,7 @@ void sub_08094B94(Object6AEntity* this) {
if (e != NULL) {
CopyPosition(&gPlayerEntity, e);
e->z.HALF.HI = -48;
((Object6AEntity*)e)->ctx = StartCutscene(e, &script_0800AEDC);
((Object6AEntity*)e)->ctx = StartCutscene(e, &script_Object6ATheLittleHat);
CreateDust(e);
e->z.HALF.HI += 16;
e->y.HALF.HI++;
@@ -535,7 +535,7 @@ void sub_08095244(Object6AEntity* this) {
if (e != NULL) {
e->parent = super;
PositionRelative(super, e, 0x100000, -0x100000);
((Object6AEntity*)e)->ctx = StartCutscene(e, &script_0801183C);
((Object6AEntity*)e)->ctx = StartCutscene(e, &script_Object6ASwordInChest);
}
}
}
@@ -804,7 +804,7 @@ void sub_08095810(Object6AEntity* this) {
e->parent = super;
CopyPosition(super, e);
ResolveEntityOnTop(super, e);
((Object6AEntity*)e)->ctx = StartCutscene(e, &script_08011940);
((Object6AEntity*)e)->ctx = StartCutscene(e, &script_ZeldaMagic);
}
}
@@ -873,7 +873,7 @@ void sub_08095954(Object6AEntity* this) {
EnqueueSFX(292);
super->frame &= ~1;
} else {
gActiveScriptInfo.unk_00 |= 0x100;
gActiveScriptInfo.syncFlags |= 0x100;
}
}
@@ -1069,7 +1069,7 @@ void sub_08095D8C(Object6AEntity* this, ScriptExecutionContext* ctx) {
}
void sub_08095DBC(Object6AEntity* this) {
if (gActiveScriptInfo.unk_00 & 0x10)
if (gActiveScriptInfo.syncFlags & 0x10)
DeleteThisEntity();
if (super->type2 == 0) {
if (super->action == 0) {
@@ -1085,7 +1085,7 @@ void sub_08095DBC(Object6AEntity* this) {
super->spriteRendering.b3 = gUnk_08114F30[super->spriteRendering.b3];
ResolveEntityOnTop(super, super);
}
if ((super->type2 & 0x80) == 0 && gActiveScriptInfo.unk_00 & 0x20000) {
if ((super->type2 & 0x80) == 0 && gActiveScriptInfo.syncFlags & 0x20000) {
super->type2 = -1;
super->zVelocity = 0x40000;
super->speed = 0xC000;