From 928687bdf61fa44aec66e36adae2ae9f241d7b48 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 2 Jun 2017 08:24:32 -0400
Subject: sub_80FF1B0 (thanks revo :lovechatot:)

---
 src/decoration.c | 22 ++++++++++++++++++++++
 src/fieldmap.c   |  1 -
 src/tv.c         |  0
 3 files changed, 22 insertions(+), 1 deletion(-)
 mode change 100755 => 100644 src/decoration.c
 mode change 100755 => 100644 src/tv.c

(limited to 'src')

diff --git a/src/decoration.c b/src/decoration.c
old mode 100755
new mode 100644
index ba923d527..482b5922e
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -10,8 +10,12 @@
 #include "palette.h"
 #include "field_player_avatar.h"
 #include "field_camera.h"
+#include "fieldmap.h"
+#include "metatile_behavior.h"
 #include "decoration.h"
 
+extern Script gUnknown_0815F399;
+
 void sub_80FE1DC(void)
 {
     sub_80FE2B4();
@@ -612,3 +616,21 @@ void sub_80FF160(u8 taskId)
         sub_80FE5AC(taskId);
     }
 }
+
+u16 sub_80FF1B0(u8 decoId, u8 a1)
+{
+    u16 retval;
+    retval = 0xffff;
+
+    switch (decoId)
+    {
+        case DECOR_STAND:
+            retval = gUnknown_083EC97C[a1] << 12;
+            return retval;
+        case DECOR_SLIDE:
+            retval = gUnknown_083EC984[a1] << 12;
+            return retval;
+        default:
+            return retval;
+    }
+}
diff --git a/src/fieldmap.c b/src/fieldmap.c
index 46b996e52..2ed2266f5 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -40,7 +40,6 @@ void fillSouthConnection(struct MapHeader *, struct MapHeader *, s32);
 void fillNorthConnection(struct MapHeader *, struct MapHeader *, s32);
 void fillWestConnection(struct MapHeader *, struct MapHeader *, s32);
 void fillEastConnection(struct MapHeader *, struct MapHeader *, s32);
-u32 GetBehaviorByMetatileId(u16 metatile);
 struct MapConnection *sub_8056A64(u8 direction, int x, int y);
 bool8 sub_8056ABC(u8 direction, int x, int y, struct MapConnection *connection);
 bool8 sub_8056B20(int x, int src_width, int dest_width, int offset);
diff --git a/src/tv.c b/src/tv.c
old mode 100755
new mode 100644
-- 
cgit v1.2.3