From 417fc62e75ee504ec11f2bd7e656f9887b431b79 Mon Sep 17 00:00:00 2001
From: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Date: Sun, 20 Mar 2022 16:03:38 +0000
Subject: [PATCH] Fix includes, change layer->collisionData accesses

---
 src/code_08049DF4.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/code_08049DF4.c b/src/code_08049DF4.c
index bea42f79..cf3c7fa9 100644
--- a/src/code_08049DF4.c
+++ b/src/code_08049DF4.c
@@ -1,6 +1,8 @@
 #define NENT_DEPRECATED
+#include "asm.h"
 #include "global.h"
 #include "entity.h"
+#include "functions.h"
 #include "map.h"
 #include "player.h"
 #include "room.h"
@@ -213,13 +215,13 @@ u32 sub_0804A168(Entity* entA, Entity* entB, LayerStruct* layer) {
         tile1 = TILE(uVar2, entA->y.HALF.HI + 10);
         tile2 = TILE(uVar2, entB->y.HALF.HI);
 
-        if (sub_0804A4BC(layer->collisionData + tile1, layer->collisionData + tile2, 0x40, uVar3)) {
+        if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], 0x40, uVar3)) {
             uVar2 = entA->x.HALF.HI + 4;
             uVar3 ^= 0xF;
             tile1 = TILE(uVar2, entA->y.HALF.HI + 10);
             tile2 = TILE(uVar2, entB->y.HALF.HI);
 
-            if (sub_0804A4BC(layer->collisionData + tile1, layer->collisionData + tile2, 0x40, uVar3)) {
+            if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], 0x40, uVar3)) {
                 return 0x10;
             }
         }
@@ -229,13 +231,13 @@ u32 sub_0804A168(Entity* entA, Entity* entB, LayerStruct* layer) {
         tile1 = TILE(uVar2, entA->y.HALF.HI - 10);
         tile2 = TILE(uVar2, entB->y.HALF.HI);
 
-        if (sub_0804A4BC(layer->collisionData + tile1, layer->collisionData + tile2, -0x40, uVar3)) {
+        if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], -0x40, uVar3)) {
             uVar2 = entA->x.HALF.HI + 4;
             uVar3 ^= 0xF;
             tile1 = TILE(uVar2, entA->y.HALF.HI - 10);
             tile2 = TILE(uVar2, entB->y.HALF.HI);
 
-            if (sub_0804A4BC(layer->collisionData + tile1, layer->collisionData + tile2, -0x40, uVar3)) {
+            if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], -0x40, uVar3)) {
                 return 0;
             }
         }
@@ -255,13 +257,13 @@ u32 sub_0804A318(Entity* entA, Entity* entB, LayerStruct* layer) {
         tile1 = TILE(entA->x.HALF.HI + 10, uVar2);
         tile2 = TILE(entB->x.HALF.HI, uVar2);
 
-        if (sub_0804A4BC(layer->collisionData + tile1, layer->collisionData + tile2, 1, uVar3)) {
+        if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], 1, uVar3)) {
             uVar2 = entA->y.HALF.HI + 4;
             uVar3 ^= 0xF;
             tile1 = TILE(entA->x.HALF.HI + 10, uVar2);
             tile2 = TILE(entB->x.HALF.HI, uVar2);
 
-            if (sub_0804A4BC(layer->collisionData + tile1, layer->collisionData + tile2, 1, uVar3)) {
+            if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], 1, uVar3)) {
                 return 8;
             }
         }
@@ -271,12 +273,12 @@ u32 sub_0804A318(Entity* entA, Entity* entB, LayerStruct* layer) {
         tile1 = TILE(entA->x.HALF.HI - 10, uVar2);
         tile2 = TILE(entB->x.HALF.HI, uVar2);
 
-        if (sub_0804A4BC(layer->collisionData + tile1, layer->collisionData + tile2, -1, uVar3)) {
+        if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], -1, uVar3)) {
             uVar2 = entA->y.HALF.HI + 4;
             uVar3 ^= 0xF;
             tile1 = TILE(entA->x.HALF.HI - 10, uVar2);
             tile2 = TILE(entB->x.HALF.HI, uVar2);
-            if (sub_0804A4BC(layer->collisionData + tile1, layer->collisionData + tile2, -1, uVar3)) {
+            if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], -1, uVar3)) {
                 return 0x18;
             }
         }