SetUpReflection

4 files changed, 50 insertions, 96 deletions

diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 9df9dfd8d..7dfe61f03 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -6,102 +6,6 @@
 
 	.text
 
-	thumb_func_start SetUpReflection
-SetUpReflection: @ 812680C
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r6, r0, 0
-	adds r4, r1, 0
-	lsls r5, r2, 24
-	lsrs r5, 24
-	movs r0, 0x20
-	ldrsh r1, [r4, r0]
-	movs r0, 0x22
-	ldrsh r2, [r4, r0]
-	adds r0, r4, 0
-	movs r3, 0x98
-	bl obj_unfreeze
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	ldr r0, _081268BC @ =gSprites
-	adds r7, r1, r0
-	ldr r0, _081268C0 @ =sub_81269E0
-	str r0, [r7, 0x1C]
-	ldrb r1, [r7, 0x5]
-	movs r0, 0xC
-	orrs r1, r0
-	strb r1, [r7, 0x5]
-	ldr r2, _081268C4 @ =gUnknown_0830FD14
-	lsrs r0, r1, 4
-	adds r0, r2
-	ldrb r0, [r0]
-	lsls r0, 4
-	movs r2, 0xF
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r7, 0x5]
-	movs r1, 0x3F
-	adds r1, r7
-	mov r8, r1
-	ldrb r0, [r1]
-	movs r1, 0x40
-	orrs r0, r1
-	mov r1, r8
-	strb r0, [r1]
-	ldr r0, _081268C8 @ =gDummySpriteAnimTable
-	str r0, [r7, 0x8]
-	adds r0, r7, 0
-	movs r1, 0
-	bl StartSpriteAnim
-	ldr r0, _081268CC @ =gDummySpriteAffineAnimTable
-	str r0, [r7, 0x10]
-	mov r1, r8
-	ldrb r0, [r1]
-	movs r1, 0x8
-	orrs r0, r1
-	mov r1, r8
-	strb r0, [r1]
-	adds r2, r7, 0
-	adds r2, 0x42
-	ldrb r1, [r2]
-	movs r0, 0x3F
-	ands r0, r1
-	strb r0, [r2]
-	ldrh r0, [r4, 0x2E]
-	strh r0, [r7, 0x2E]
-	ldrb r0, [r6, 0x8]
-	strh r0, [r7, 0x30]
-	strh r5, [r7, 0x3C]
-	adds r0, r6, 0
-	adds r1, r7, 0
-	bl npc_pal_op
-	cmp r5, 0
-	bne _081268B2
-	ldrb r0, [r7, 0x1]
-	movs r1, 0x4
-	negs r1, r1
-	ands r1, r0
-	movs r0, 0x1
-	orrs r1, r0
-	strb r1, [r7, 0x1]
-_081268B2:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081268BC: .4byte gSprites
-_081268C0: .4byte sub_81269E0
-_081268C4: .4byte gUnknown_0830FD14
-_081268C8: .4byte gDummySpriteAnimTable
-_081268CC: .4byte gDummySpriteAffineAnimTable
-	thumb_func_end SetUpReflection
-
 	thumb_func_start sub_81268D0
 sub_81268D0: @ 81268D0
 	push {lr}
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index d2a1a9b1f..23763aa1a 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -3,6 +3,8 @@
 
 #include "sprite.h"
 
+const u8 gUnknown_0830FD14[16];
+
 #define fieldmap_object_cb(setup, callback, table) \
 static u8 callback(struct MapObject *, struct Sprite *);\
 void setup(struct Sprite *sprite)\
@@ -427,5 +429,6 @@ void sub_80634D0(struct MapObject *, struct Sprite *);
 u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
 void CameraObjectSetFollowedObjectId(u8);
 u8 sub_805ADDC(u8);
+u8 obj_unfreeze(struct Sprite *, s16, s16, u8);
 
 #endif // GUARD_FIELD_MAP_OBJ_H
diff --git a/ld_script.txt b/ld_script.txt
index 05ce91cee..c8f29c5db 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -232,6 +232,7 @@ SECTIONS {
         src/unused_8124F94.o(.text);
         src/save.o(.text);
         src/mystery_event_script.o(.text);
+        src/field_effect_helpers.o(.text);
         asm/field_effect_helpers.o(.text);
         asm/contest_ai.o(.text);
         asm/battle_anim_81258BC.o(.text);
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
new file mode 100644
index 000000000..6b068a1b7
--- /dev/null
+++ b/src/field_effect_helpers.c
@@ -0,0 +1,46 @@
+//
+// Created by scott on 9/9/2017.
+//
+
+
+// Includes
+#include "global.h"
+#include "sprite.h"
+#include "field_map_obj.h"
+#include "field_effect_helpers.h"
+
+// Static type declarations
+
+// Static RAM declarations
+
+// Static ROM declarations
+/*static*/ void sub_81269E0(struct Sprite *);
+/*static*/ void npc_pal_op(struct MapObject *mapObject, struct Sprite *sprite);
+
+// .rodata
+
+// .text
+
+void SetUpReflection(struct MapObject *mapObject, struct Sprite *sprite, bool8 flag)
+{
+    struct Sprite *newSprite;
+
+    newSprite = &gSprites[obj_unfreeze(sprite, sprite->pos1.x, sprite->pos1.y, 0x98)];
+    newSprite->callback = sub_81269E0;
+    newSprite->oam.priority = 3;
+    newSprite->oam.paletteNum = gUnknown_0830FD14[newSprite->oam.paletteNum];
+    newSprite->usingSheet = TRUE;
+    newSprite->anims = gDummySpriteAnimTable;
+    StartSpriteAnim(newSprite, 0);
+    newSprite->affineAnims = gDummySpriteAffineAnimTable;
+    newSprite->affineAnimBeginning = TRUE;
+    newSprite->subspriteMode = 0;
+    newSprite->data0 = sprite->data0;
+    newSprite->data1 = mapObject->localId;
+    newSprite->data7 = flag;
+    npc_pal_op(mapObject, newSprite);
+    if (!flag)
+    {
+        newSprite->oam.affineMode = 1;
+    }
+}