summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-09-06 22:46:44 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-09-06 22:46:44 -0400
commit112177b57f6f5ca95cd97bbe7a9a86924b341e5c (patch)
treeb6499545cc954b8253ffa789bbfa28821458adb6 /src
parent1f83a2885e540dbf473e3f5200e35f5fc6df96b3 (diff)
Slight touching up of data3.s; denote boundaries of data/field_map_obj.s for future split
Diffstat (limited to 'src')
-rw-r--r--src/field_map_obj.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index e6376d156..e3e0b7158 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -10,6 +10,8 @@
#include "field_ground_effect.h"
#include "field_map_obj.h"
+#define NUM_FIELD_MAP_OBJECT_TEMPLATES 0x51
+
// Static struct declarations
// Static RAM declarations
@@ -31,8 +33,9 @@ void sub_8096518(struct MapObject *, struct Sprite *);
// ROM data
-const u8 gUnknown_085055CD[0x53];
-const u8 gUnknown_0850557C[0x51];
+void (*const gUnknown_08505438[NUM_FIELD_MAP_OBJECT_TEMPLATES])(struct Sprite *);
+const u8 gUnknown_0850557C[NUM_FIELD_MAP_OBJECT_TEMPLATES];
+const u8 gUnknown_085055CD[NUM_FIELD_MAP_OBJECT_TEMPLATES];
// Code
@@ -605,3 +608,8 @@ void MakeObjectTemplateFromFieldObjectGraphicsInfo(u16 graphicsId, void (*callba
sprTemplate->callback = callback;
*subspriteTables = gfxInfo->subspriteTables;
}
+
+void MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables)
+{
+ MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, gUnknown_08505438[callbackIndex], sprTemplate, subspriteTables);
+}