merge

src/npc/npc4E.c

@@ -17,8 +17,8 @@ typedef struct {
 
 extern void sub_08078850(Entity*, u32, u8 /* TODO this is a s8 in beedle.c*/, gUnk_0810C89C_struct*);
 
-extern void script_08016030; // Cutscene data type?
-extern void script_0801606C; // Cutscene data type?
+extern void script_Object3ELeftStoneOpening;  // Cutscene data type?
+extern void script_Object3ERightStoneOpening; // Cutscene data type?
 
 const Hitbox gUnk_08114154;
 const u8 gUnk_0811415C[];
@@ -142,12 +142,12 @@ void sub_0806DB84(Entity* this, ScriptExecutionContext* context) {
     ent = CreateObject(OBJECT_3E, 4, 0);
     if (ent != NULL) {
         PositionRelative(this, ent, -0x80000, 0);
-        *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_08016030);
+        *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_Object3ELeftStoneOpening);
     }
     ent = CreateObject(OBJECT_3E, 5, 0);
     if (ent != NULL) {
         PositionRelative(this, ent, 0x80000, 0);
-        *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_0801606C);
+        *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_Object3ERightStoneOpening);
     }
 }
 

src/npc/rem.c

@@ -6,7 +6,7 @@ extern void sub_0806A8C8(Entity*);
 extern void (*gUnk_08112260[])(Entity*);
 extern void (*gUnk_08112278[])(Entity*);
 
-extern void script_08012F0C;
+extern void script_Rem;
 
 extern void sub_08078850(Entity*, u32, u32, u32*);
 extern u32 gUnk_0811229C;
@@ -51,7 +51,7 @@ void sub_0806A3D8(Entity* this) {
     this->actionDelay = 0xb4;
     SetDefaultPriority(this, PRIO_MESSAGE);
     sub_0806A8C8(this);
-    uVar1 = StartCutscene(this, &script_08012F0C);
+    uVar1 = StartCutscene(this, &script_Rem);
     *(ScriptExecutionContext**)&this->cutsceneBeh = uVar1;
     sub_0807DD94(this, NULL);
 }
@@ -132,7 +132,7 @@ void sub_0806A550(Entity* this) {
         if (this->frame == 1) {
             this->frame = 0;
             InitScreenShake(8, 2);
-            gActiveScriptInfo.unk_00 |= 0x100;
+            gActiveScriptInfo.syncFlags |= 0x100;
             SoundReq(SFX_CHEST_OPEN);
         }
         if ((this->frame & 0x80) != 0) {
@@ -173,7 +173,7 @@ void sub_0806A630(Entity* this) {
         this->action = 1;
         InitializeAnimation(this, 0x12);
     }
-    if ((gActiveScriptInfo.unk_00 & 0x100) != 0) {
+    if ((gActiveScriptInfo.syncFlags & 0x100) != 0) {
         GetNextFrame(this);
     }
     if (this->frame == 1) {
@@ -192,7 +192,7 @@ void sub_0806A830(Entity* this) {
         InitializeAnimation(this, 0x14);
         SetDefaultPriority(this, PRIO_MESSAGE);
     }
-    if ((gActiveScriptInfo.unk_00 & 0x200) != 0) {
+    if ((gActiveScriptInfo.syncFlags & 0x200) != 0) {
         DeleteThisEntity();
     }
     GetNextFrame(this);

src/npc/stockwell.c

@@ -13,7 +13,7 @@ extern bool32 sub_08056338(void);
 
 extern void sub_08078850(Entity*, u32, u8, u32*);
 extern u32 gUnk_0810FDA0;
-extern u16 script_080142B0;
+extern u16 script_Stockwell;
 
 void Stockwell(Entity* this) {
     gUnk_0810FDA4[this->action](this);
@@ -32,7 +32,7 @@ void sub_08065080(Entity* this) {
 #ifndef EU
     sub_08078850(this, 0, 0, &gUnk_0810FDA0);
 #endif
-    context = StartCutscene(this, &script_080142B0);
+    context = StartCutscene(this, &script_Stockwell);
     *(ScriptExecutionContext**)&this->cutsceneBeh = context;
 }
 

src/npc/talon.c

@@ -4,7 +4,7 @@
 extern void (*gUnk_0810FEC4[])(Entity* this);
 extern void (*gUnk_0810FEBC[])(Entity* this);
 extern SpriteLoadData gUnk_0810FEB0;
-extern u8 script_0800B41C;
+extern u8 script_TalonGotKey;
 extern u8 gUnk_0810FED8[];
 
 void sub_0806574C(Entity* this);
@@ -103,7 +103,7 @@ void sub_080656D4(Entity* this) {
     } else {
         if (this->interactType != 0) {
             if (GetInventoryValue(0x37) != 0) { // keyLonLon
-                StartCutscene(this, (u16*)&script_0800B41C);
+                StartCutscene(this, (u16*)&script_TalonGotKey);
                 goto label2;
             } else {
                 this->field_0x68.HALF.HI = this->action;

src/npc/windTribespeople.c

@@ -15,7 +15,7 @@ extern void (*const gUnk_08113A7C[])(Entity*);
 extern void (*const gUnk_08113A8C[])(Entity*, ScriptExecutionContext*);
 
 extern SpriteLoadData gUnk_08113A1C[];
-extern u16 script_08014A80;
+extern u16 script_WindTribespeople6;
 extern Dialog gUnk_08113ABC[];
 extern u16 gUnk_08113B0C[];
 
@@ -64,7 +64,7 @@ void sub_0806C7D4(Entity* this) {
         sub_0807DD94(this, NULL);
         if ((this->type2 == 3) && (!CheckGlobalFlag(WARP_EVENT_END)) && (CheckLocalFlag(0x63)) && (CheckRoomFlag(0))) {
             this->type2 = 7;
-            sub_0807DD80(this, &script_08014A80);
+            sub_0807DD80(this, &script_WindTribespeople6);
         }
     }
 }