summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-06-02 08:24:32 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-06-02 08:24:51 -0400
commit928687bdf61fa44aec66e36adae2ae9f241d7b48 (patch)
treee7bd8da317c7f5acc219a7d59193bee47943ddc8 /src
parent6e4c1d2c119122d3207c157f110053d9ab97b004 (diff)
sub_80FF1B0 (thanks revo :lovechatot:)
Diffstat (limited to 'src')
-rw-r--r--[-rwxr-xr-x]src/decoration.c22
-rw-r--r--src/fieldmap.c1
-rw-r--r--[-rwxr-xr-x]src/tv.c0
3 files changed, 22 insertions, 1 deletions
diff --git a/src/decoration.c b/src/decoration.c
index ba923d527..482b5922e 100755..100644
--- 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
index 566d547a6..566d547a6 100755..100644
--- a/src/tv.c
+++ b/src/tv.c