SpawnFieldObjectInternal

4 files changed, 83 insertions, 214 deletions

diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index ff3aff842..f59a3a7c9 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -5,220 +5,6 @@
 
 	.text
 
-	thumb_func_start SpawnFieldObjectInternal
-@ u8 SpawnFieldObjectInternal(struct FieldObjectTemplate *romFieldObject, struct objtemplate *template, int mapId, int mapGroupId, u16 movingCameraOffsetX, u16 movingCameraOffsetY)
-SpawnFieldObjectInternal: @ 808D98C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	mov r8, r1
-	adds r1, r2, 0
-	adds r2, r3, 0
-	ldr r3, [sp, 0x24]
-	ldr r4, [sp, 0x28]
-	lsls r1, 24
-	lsrs r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	lsls r3, 16
-	lsrs r3, 16
-	mov r10, r3
-	lsls r4, 16
-	lsrs r4, 16
-	str r4, [sp]
-	bl InitFieldObjectStateFromTemplate
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	cmp r0, 0x10
-	bne _0808D9C8
-	movs r0, 0x10
-	b _0808DB2C
-_0808D9C8:
-	mov r0, r9
-	lsls r4, r0, 3
-	adds r0, r4, r0
-	lsls r0, 2
-	ldr r1, =gMapObjects
-	adds r6, r0, r1
-	ldrb r0, [r6, 0x5]
-	bl GetFieldObjectGraphicsInfo
-	adds r7, r0, 0
-	ldrb r0, [r7, 0xC]
-	lsls r0, 28
-	lsrs r5, r0, 28
-	cmp r5, 0
-	bne _0808D9F4
-	ldrh r0, [r7, 0x2]
-	movs r1, 0
-	bl npc_load_two_palettes__no_record
-	b _0808DA16
-	.pool
-_0808D9F4:
-	cmp r5, 0xA
-	bne _0808DA02
-	ldrh r0, [r7, 0x2]
-	movs r1, 0xA
-	bl npc_load_two_palettes__and_record
-	b _0808DA16
-_0808DA02:
-	cmp r5, 0xF
-	bls _0808DA16
-	adds r0, r5, 0
-	subs r0, 0x10
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldrh r0, [r7, 0x2]
-	adds r1, r5, 0
-	bl sub_808EAB0
-_0808DA16:
-	ldrb r0, [r6, 0x6]
-	cmp r0, 0x4C
-	bne _0808DA24
-	ldrb r0, [r6, 0x1]
-	movs r1, 0x20
-	orrs r0, r1
-	strb r0, [r6, 0x1]
-_0808DA24:
-	ldr r1, =0x0000ffff
-	adds r0, r1, 0
-	mov r2, r8
-	strh r0, [r2, 0x2]
-	mov r0, r8
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	cmp r0, 0x40
-	bne _0808DA64
-	ldr r0, =gMapObjects
-	mov r2, r9
-	adds r1, r4, r2
-	lsls r1, 2
-	adds r1, r0
-	ldrb r2, [r1]
-	movs r0, 0x2
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1]
-	movs r0, 0x10
-	b _0808DB2C
-	.pool
-_0808DA64:
-	mov r1, r8
-	lsls r0, r1, 4
-	add r0, r8
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r4, r0, r1
-	mov r2, r10
-	lsls r0, r2, 16
-	asrs r0, 16
-	ldrh r1, [r6, 0x10]
-	adds r0, r1
-	lsls r0, 16
-	asrs r0, 16
-	ldr r2, [sp]
-	lsls r1, r2, 16
-	asrs r1, 16
-	ldrh r2, [r6, 0x12]
-	adds r1, r2
-	lsls r1, 16
-	asrs r1, 16
-	adds r2, r4, 0
-	adds r2, 0x20
-	adds r3, r4, 0
-	adds r3, 0x22
-	bl sub_8092FF0
-	ldrh r0, [r7, 0x8]
-	lsls r0, 16
-	asrs r0, 17
-	negs r0, r0
-	adds r1, r4, 0
-	adds r1, 0x28
-	strb r0, [r1]
-	ldrh r0, [r7, 0xA]
-	lsls r0, 16
-	asrs r0, 17
-	negs r0, r0
-	adds r2, r4, 0
-	adds r2, 0x29
-	strb r0, [r2]
-	ldrh r0, [r4, 0x20]
-	adds r0, 0x8
-	strh r0, [r4, 0x20]
-	ldrh r1, [r4, 0x22]
-	adds r1, 0x10
-	movs r0, 0
-	ldrsb r0, [r2, r0]
-	adds r0, r1
-	strh r0, [r4, 0x22]
-	lsls r2, r5, 4
-	ldrb r1, [r4, 0x5]
-	movs r0, 0xF
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r4, 0x5]
-	adds r2, r4, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r2]
-	mov r0, r9
-	strh r0, [r4, 0x2E]
-	mov r1, r8
-	strb r1, [r6, 0x4]
-	ldrb r1, [r7, 0xC]
-	lsls r1, 25
-	lsrs r1, 31
-	lsls r1, 4
-	ldrb r2, [r6, 0x1]
-	movs r0, 0x11
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r6, 0x1]
-	lsls r0, 27
-	cmp r0, 0
-	blt _0808DB16
-	ldrb r0, [r6, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl FieldObjectDirectionToImageAnimId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl StartSpriteAnim
-_0808DB16:
-	ldrb r0, [r6, 0xB]
-	lsrs r0, 4
-	adds r1, r4, 0
-	movs r2, 0x1
-	bl SetObjectSubpriorityByZCoord
-	adds r0, r6, 0
-	adds r1, r4, 0
-	bl sub_8096518
-	mov r0, r9
-_0808DB2C:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end SpawnFieldObjectInternal
-
 	thumb_func_start SpawnFieldObject
 @ u8 SpawnFieldObject(struct FieldObjectTemplate *romNpc, u8 mapId, u8 mapGroupId, u16 movingCameraOffsetX, u16 movingCameraOffsetY)
 SpawnFieldObject: @ 808DB40
diff --git a/include/field_ground_effect.h b/include/field_ground_effect.h
new file mode 100644
index 000000000..2b93273db
--- /dev/null
+++ b/include/field_ground_effect.h
@@ -0,0 +1,15 @@
+//
+// Created by scott on 9/6/2017.
+//
+
+#ifndef POKEEMERALD_FIELD_GROUND_EFFECT_H
+#define POKEEMERALD_FIELD_GROUND_EFFECT_H
+
+// Exported type declarations
+
+// Exported RAM declarations
+
+// Exported ROM declarations
+void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8);
+
+#endif //POKEEMERALD_FIELD_GROUND_EFFECT_H
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 6ca6b4103..6ddff4901 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -18,6 +18,11 @@ u8 GetFieldObjectIdByXY(s16, s16);
 u8 sub_808D4F4(void);
 void RemoveFieldObject(struct MapObject *);
 void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8);
+void npc_load_two_palettes__no_record(u16, u8);
+void npc_load_two_palettes__and_record(u16, u8);
+void sub_808EAB0(u16, u8);
+void sub_8092FF0(s16, s16, s16 *, s16 *);
+u8 FieldObjectDirectionToImageAnimId(u8);
 
 // Exported data declarations
 
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 6e15d3e86..a3fb1a5d3 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -7,6 +7,7 @@
 #include "event_data.h"
 #include "rom_818CFC8.h"
 #include "rom_81BE66C.h"
+#include "field_ground_effect.h"
 #include "field_map_obj.h"
 
 // Static struct declarations
@@ -23,6 +24,7 @@ static bool8 GetAvailableFieldObjectSlot(u16, u8, u8, u8 *);
 static void RemoveFieldObjectInternal (struct MapObject *);
 /*static*/ u16 GetFieldObjectFlagIdByFieldObjectId(u8);
 /*static*/ struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8);
+void sub_8096518(struct MapObject *, struct Sprite *);
 
 // ROM data
 
@@ -455,3 +457,64 @@ void unref_sub_808D958(void)
         }
     }
 }
+
+u8 SpawnFieldObjectInternal(struct MapObjectTemplate *mapObjectTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY)
+{
+    struct MapObject *mapObject;
+    struct MapObjectGraphicsInfo *graphicsInfo;
+    struct Sprite *sprite;
+    u8 mapObjectId;
+    u8 paletteSlot;
+    u8 spriteId;
+
+    mapObjectId = InitFieldObjectStateFromTemplate(mapObjectTemplate, mapNum, mapGroup);
+    if (mapObjectId == ARRAY_COUNT(gMapObjects))
+    {
+        return ARRAY_COUNT(gMapObjects);
+    }
+    mapObject = &gMapObjects[mapObjectId];
+    graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
+    paletteSlot = graphicsInfo->paletteSlot;
+    if (paletteSlot == 0)
+    {
+        npc_load_two_palettes__no_record(graphicsInfo->paletteTag1, 0);
+    }
+    else if (paletteSlot == 10)
+    {
+        npc_load_two_palettes__and_record(graphicsInfo->paletteTag1, 10);
+    }
+    else if (paletteSlot >= 16)
+    {
+        paletteSlot -= 16;
+        sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot);
+    }
+    if (mapObject->animPattern == 0x4c)
+    {
+        mapObject->mapobj_bit_13 = TRUE;
+    }
+    *(u16 *)&spriteTemplate->paletteTag = 0xFFFF;
+    spriteId = CreateSprite(spriteTemplate, 0, 0, 0);
+    if (spriteId == MAX_SPRITES)
+    {
+        gMapObjects[mapObjectId].active = FALSE;
+        return ARRAY_COUNT(gMapObjects);
+    }
+    sprite = &gSprites[spriteId];
+    sub_8092FF0(mapObject->coords2.x + cameraX, mapObject->coords2.y + cameraY, &sprite->pos1.x, &sprite->pos1.y);
+    sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
+    sprite->centerToCornerVecY = -(graphicsInfo->height >> 1);
+    sprite->pos1.x += 8;
+    sprite->pos1.y += 16 + sprite->centerToCornerVecY;
+    sprite->oam.paletteNum = paletteSlot;
+    sprite->coordOffsetEnabled = TRUE;
+    sprite->data0 = mapObjectId;
+    mapObject->spriteId = spriteId;
+    mapObject->mapobj_bit_12 = graphicsInfo->inanimate;
+    if (!mapObject->mapobj_bit_12)
+    {
+        StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->mapobj_unk_18));
+    }
+    SetObjectSubpriorityByZCoord(mapObject->elevation, sprite, 1);
+    sub_8096518(mapObject, sprite);
+    return mapObjectId;
+}