IsStarterInParty

3 files changed, 57 insertions, 156 deletions

diff --git a/asm/field_specials.s b/asm/field_specials.s
index 8902105e3..34caae330 100755
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -6,161 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_810F5BC
-sub_810F5BC: @ 810F5BC
-	push {lr}
-	movs r0, 0xC7
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	bne _0810F610
-	ldr r0, _0810F5E8 @ =gSaveBlock1
-	ldrh r1, [r0, 0x4]
-	movs r0, 0x83
-	lsls r0, 3
-	cmp r1, r0
-	bne _0810F610
-	subs r0, 0x75
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _0810F5F0
-	ldr r0, _0810F5EC @ =0x0000409a
-	movs r1, 0x4
-	b _0810F602
-	.align 2, 0
-_0810F5E8: .4byte gSaveBlock1
-_0810F5EC: .4byte 0x0000409a
-_0810F5F0:
-	movs r0, 0xE9
-	lsls r0, 2
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _0810F610
-	ldr r0, _0810F60C @ =0x0000409a
-	movs r1, 0x5
-_0810F602:
-	bl VarSet
-	movs r0, 0x1
-	b _0810F612
-	.align 2, 0
-_0810F60C: .4byte 0x0000409a
-_0810F610:
-	movs r0, 0
-_0810F612:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_810F5BC
-
-	thumb_func_start SetShoalItemFlag
-SetShoalItemFlag: @ 810F618
-	push {lr}
-	ldr r0, _0810F624 @ =0x0000085f
-	bl FlagSet
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810F624: .4byte 0x0000085f
-	thumb_func_end SetShoalItemFlag
-
-	thumb_func_start PutZigzagoonInPlayerParty
-PutZigzagoonInPlayerParty: @ 810F628
-	push {r4,r5,lr}
-	sub sp, 0x14
-	ldr r5, _0810F690 @ =gPlayerParty
-	movs r1, 0x90
-	lsls r1, 1
-	movs r4, 0
-	str r4, [sp]
-	str r4, [sp, 0x4]
-	str r4, [sp, 0x8]
-	str r4, [sp, 0xC]
-	adds r0, r5, 0
-	movs r2, 0x7
-	movs r3, 0x20
-	bl CreateMon
-	movs r1, 0x1
-	add r0, sp, 0x10
-	strh r1, [r0]
-	adds r0, r5, 0
-	movs r1, 0x2E
-	add r2, sp, 0x10
-	bl SetMonData
-	add r1, sp, 0x10
-	movs r0, 0x21
-	strh r0, [r1]
-	adds r0, r5, 0
-	movs r1, 0xD
-	add r2, sp, 0x10
-	bl SetMonData
-	add r0, sp, 0x10
-	strh r4, [r0]
-	adds r0, r5, 0
-	movs r1, 0xE
-	add r2, sp, 0x10
-	bl SetMonData
-	adds r0, r5, 0
-	movs r1, 0xF
-	add r2, sp, 0x10
-	bl SetMonData
-	adds r0, r5, 0
-	movs r1, 0x10
-	add r2, sp, 0x10
-	bl SetMonData
-	add sp, 0x14
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810F690: .4byte gPlayerParty
-	thumb_func_end PutZigzagoonInPlayerParty
-
-	thumb_func_start IsStarterInParty
-IsStarterInParty: @ 810F694
-	push {r4-r6,lr}
-	ldr r0, _0810F6D0 @ =0x00004023
-	bl VarGet
-	lsls r0, 16
-	lsrs r0, 16
-	bl GetStarterPokemon
-	lsls r0, 16
-	lsrs r6, r0, 16
-	bl CalculatePlayerPartyCount
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r4, 0
-	cmp r4, r5
-	bcs _0810F6E2
-_0810F6B6:
-	movs r0, 0x64
-	muls r0, r4
-	ldr r1, _0810F6D4 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x41
-	movs r2, 0
-	bl GetMonData
-	cmp r0, r6
-	bne _0810F6D8
-	movs r0, 0x1
-	b _0810F6E4
-	.align 2, 0
-_0810F6D0: .4byte 0x00004023
-_0810F6D4: .4byte gPlayerParty
-_0810F6D8:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, r5
-	bcc _0810F6B6
-_0810F6E2:
-	movs r0, 0
-_0810F6E4:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end IsStarterInParty
-
 	thumb_func_start CheckFreePokemonStorageSpace
 CheckFreePokemonStorageSpace: @ 810F6EC
 	push {r4-r6,lr}
diff --git a/include/vars.h b/include/vars.h
index 6bbe1325a..fcc3311a6 100644..100755
--- a/include/vars.h
+++ b/include/vars.h
@@ -33,7 +33,7 @@
 
 #define VAR_0x4089                 0x4089
 #define VAR_0x4097                 0x4097
-
+#define VAR_0x409a                 0x409a
 #define VAR_PORTHOLE               0x40B4
 
 #define VAR_0x40BC                 0x40BC
diff --git a/src/field_specials.c b/src/field_specials.c
index 4129e5eba..032939244 100755
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -18,6 +18,9 @@
 #include "string_util.h"
 #include "strings.h"
 #include "pokeblock.h"
+#include "species.h"
+#include "abilities.h"
+#include "moves.h"
 #include "text.h"
 #include "wallclock.h"
 #include "tv.h"
@@ -26,6 +29,7 @@
 #include "songs.h"
 #include "sound.h"
 #include "menu.h"
+#include "starter_choose.h"
 #include "menu_helpers.h"
 
 #if ENGLISH
@@ -1850,3 +1854,55 @@ bool8 GetLeadMonEVCount(void)
     }
     return FALSE;
 }
+
+u8 sub_810F5BC(void)
+{
+    if (!FlagGet(0xc7) && gSaveBlock1.location.mapGroup == MAP_GROUP_RUSTURF_TUNNEL && gSaveBlock1.location.mapNum == MAP_ID_RUSTURF_TUNNEL)
+    {
+        if (FlagGet(0x3a3))
+        {
+            VarSet(VAR_0x409a, 4);
+            return TRUE;
+        }
+        else if (FlagGet(0x3a4))
+        {
+            VarSet(VAR_0x409a, 5);
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+void SetShoalItemFlag(u16 v0)
+{
+    FlagSet(0x85f);
+}
+
+void PutZigzagoonInPlayerParty(void)
+{
+    u16 monData;
+    CreateMon(&gPlayerParty[0], SPECIES_ZIGZAGOON, 7, 0x20, FALSE, 0, FALSE, 0);
+    monData = ABILITY_STENCH;
+    SetMonData(&gPlayerParty[0], MON_DATA_ALT_ABILITY, (u8 *)&monData);
+    monData = MOVE_TACKLE;
+    SetMonData(&gPlayerParty[0], MON_DATA_MOVE1, (u8 *)&monData);
+    monData = MOVE_NONE;
+    SetMonData(&gPlayerParty[0], MON_DATA_MOVE2, (u8 *)&monData);
+    SetMonData(&gPlayerParty[0], MON_DATA_MOVE3, (u8 *)&monData);
+    SetMonData(&gPlayerParty[0], MON_DATA_MOVE4, (u8 *)&monData);
+}
+
+bool8 IsStarterInParty(void)
+{
+    u8 i;
+    u16 starter = GetStarterPokemon(VarGet(VAR_FIRST_POKE));
+    u8 partyCount = CalculatePlayerPartyCount();
+    for (i=0; i<partyCount; i++)
+    {
+        if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL) == starter)
+        {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}