Merge pull request #571 from octorock/data

src/object/button.c

@@ -206,28 +206,30 @@ u32 sub_08081F00(u32*, u32*);
 extern u16 gMapDataTopSpecial[0x2000];
 
 extern u16 gMapDataBottomSpecial[];
-NONMATCH("asm/non_matching/button/sub_08081E6C.inc", void sub_08081E6C(Entity* this)) {
+
+void sub_08081E6C(Entity* this) {
     u32 r4;
-    u16 *tmp, *r1;
+    LayerStruct* r1;
     u16* tmp2;
+    u16* tmp;
+    u16* tmp3;
     u32 r6 = this->field_0x74.HWORD;
     u32 r5 = this->collisionLayer;
     u32 tile = GetTileType(r6, r5);
+
     if (tile < 0x4000)
         return;
-    r1 = (u16*)GetLayerByIndex(r5);
+    r1 = GetLayerByIndex(r5);
     r4 = (this->type == 0 ? 0x7a : 0x78);
-    tmp = r1 + 0x3802;
-    r1 += 0x3002 + r4;
-    tmp = tmp + (*r1 << 2);
+    tmp = r1->metatiles;
+    tmp = tmp + (r1->unkData2[r4] << 2);
     tmp2 = (r5 == 2 ? gMapDataTopSpecial : gMapDataBottomSpecial);
-    tmp2 += (((0x3f & r6) << 1) + ((0xfc0 & r6) << 2)) << 1;
+    tmp2 += (((0x3f & r6) << 1) + ((0xfc0 & r6) << 2));
     if (sub_08081F00((u32*)tmp2, (u32*)tmp))
         return;
     SetTileType(r4, r6, r5);
     SetTile(tile, r6, r5);
 }
-END_NONMATCH
 
 u32 sub_08081F00(u32* unk1, u32* unk2) {
     if (*unk1 != *unk2)

src/object/cameraTarget.c

@@ -116,7 +116,7 @@ void CameraTarget_Action2(Entity* this) {
     u32 bVar3;
     u32 temp;
     u32 temp2;
-    struct_080C9CBC* ptr;
+    const struct_080C9CBC* ptr;
 
     if ((this->type != 1) &&
         (((u8)(gUnk_03003DF0.unk_4[3] - 1) >= 100 || (this->child != *(Entity**)(gUnk_03003DF0.unk_4 + 8))))) {
@@ -133,7 +133,7 @@ void CameraTarget_Action2(Entity* this) {
                 bVar2 = this->type2;
             }
             ptr = gUnk_080C9CBC + bVar2;
-            bVar1 = ptr->_5[0];
+            bVar1 = ptr->unk6;
             bVar3 = bVar1 & 1;
             this->palette.b.b0 = bVar3;
             temp = gUnk_0811F744[bVar1] < 0;

src/object/gyorgBossObject.c

@@ -13,8 +13,7 @@
 #include "object.h"
 #include "room.h"
 #include "screen.h"
-
-extern const ScreenTransitionData gUnk_0813ABD0;
+#include "screenTransitions.h"
 
 struct GyorgChildSpawns {
     s16 offsetX;

src/object/windTribeTeleporter.c

@@ -11,14 +11,13 @@
 #include "global.h"
 #include "hitbox.h"
 #include "object.h"
+#include "screenTransitions.h"
 
 typedef struct {
     /*0x00*/ Entity base;
     /*0x68*/ u8 unk_68;
 } WindTribeTeleporterEntity;
 
-extern ScreenTransitionData gUnk_0813ADEC[];
-
 void WindTribeTeleporter_Init(WindTribeTeleporterEntity*);
 void WindTribeTeleporter_Action1(WindTribeTeleporterEntity*);
 void WindTribeTeleporter_Action2(WindTribeTeleporterEntity*);