IsGrassTypeInParty

2 files changed, 82 insertions, 214 deletions

diff --git a/asm/field_specials.s b/asm/field_specials.s
index 975dc1ca9..3c8a476cb 100755
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -6,220 +6,6 @@
 
 	.text
 
-	thumb_func_start SetTrickHouseEndRoomFlag
-SetTrickHouseEndRoomFlag: @ 810EF0C
-	push {lr}
-	ldr r1, _0810EF1C @ =gSpecialVar_0x8004
-	ldr r0, _0810EF20 @ =0x00000259
-	strh r0, [r1]
-	bl FlagSet
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810EF1C: .4byte gSpecialVar_0x8004
-_0810EF20: .4byte 0x00000259
-	thumb_func_end SetTrickHouseEndRoomFlag
-
-	thumb_func_start ResetTrickHouseEndRoomFlag
-ResetTrickHouseEndRoomFlag: @ 810EF24
-	push {lr}
-	ldr r1, _0810EF34 @ =gSpecialVar_0x8004
-	ldr r0, _0810EF38 @ =0x00000259
-	strh r0, [r1]
-	bl FlagReset
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810EF34: .4byte gSpecialVar_0x8004
-_0810EF38: .4byte 0x00000259
-	thumb_func_end ResetTrickHouseEndRoomFlag
-
-	thumb_func_start CheckLeadMonCool
-CheckLeadMonCool: @ 810EF3C
-	push {lr}
-	bl GetLeadMonIndex
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x64
-	muls r0, r1
-	ldr r1, _0810EF5C @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x16
-	bl GetMonData
-	cmp r0, 0xC7
-	bls _0810EF60
-	movs r0, 0x1
-	b _0810EF62
-	.align 2, 0
-_0810EF5C: .4byte gPlayerParty
-_0810EF60:
-	movs r0, 0
-_0810EF62:
-	pop {r1}
-	bx r1
-	thumb_func_end CheckLeadMonCool
-
-	thumb_func_start CheckLeadMonBeauty
-CheckLeadMonBeauty: @ 810EF68
-	push {lr}
-	bl GetLeadMonIndex
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x64
-	muls r0, r1
-	ldr r1, _0810EF88 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x17
-	bl GetMonData
-	cmp r0, 0xC7
-	bls _0810EF8C
-	movs r0, 0x1
-	b _0810EF8E
-	.align 2, 0
-_0810EF88: .4byte gPlayerParty
-_0810EF8C:
-	movs r0, 0
-_0810EF8E:
-	pop {r1}
-	bx r1
-	thumb_func_end CheckLeadMonBeauty
-
-	thumb_func_start CheckLeadMonCute
-CheckLeadMonCute: @ 810EF94
-	push {lr}
-	bl GetLeadMonIndex
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x64
-	muls r0, r1
-	ldr r1, _0810EFB4 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x18
-	bl GetMonData
-	cmp r0, 0xC7
-	bls _0810EFB8
-	movs r0, 0x1
-	b _0810EFBA
-	.align 2, 0
-_0810EFB4: .4byte gPlayerParty
-_0810EFB8:
-	movs r0, 0
-_0810EFBA:
-	pop {r1}
-	bx r1
-	thumb_func_end CheckLeadMonCute
-
-	thumb_func_start CheckLeadMonSmart
-CheckLeadMonSmart: @ 810EFC0
-	push {lr}
-	bl GetLeadMonIndex
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x64
-	muls r0, r1
-	ldr r1, _0810EFE0 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x21
-	bl GetMonData
-	cmp r0, 0xC7
-	bls _0810EFE4
-	movs r0, 0x1
-	b _0810EFE6
-	.align 2, 0
-_0810EFE0: .4byte gPlayerParty
-_0810EFE4:
-	movs r0, 0
-_0810EFE6:
-	pop {r1}
-	bx r1
-	thumb_func_end CheckLeadMonSmart
-
-	thumb_func_start CheckLeadMonTough
-CheckLeadMonTough: @ 810EFEC
-	push {lr}
-	bl GetLeadMonIndex
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x64
-	muls r0, r1
-	ldr r1, _0810F00C @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x2F
-	bl GetMonData
-	cmp r0, 0xC7
-	bls _0810F010
-	movs r0, 0x1
-	b _0810F012
-	.align 2, 0
-_0810F00C: .4byte gPlayerParty
-_0810F010:
-	movs r0, 0
-_0810F012:
-	pop {r1}
-	bx r1
-	thumb_func_end CheckLeadMonTough
-
-	thumb_func_start IsGrassTypeInParty
-IsGrassTypeInParty: @ 810F018
-	push {r4-r6,lr}
-	movs r5, 0
-	ldr r6, _0810F068 @ =gBaseStats
-_0810F01E:
-	movs r0, 0x64
-	adds r1, r5, 0
-	muls r1, r0
-	ldr r0, _0810F06C @ =gPlayerParty
-	adds r4, r1, r0
-	adds r0, r4, 0
-	movs r1, 0x5
-	bl GetMonData
-	cmp r0, 0
-	beq _0810F074
-	adds r0, r4, 0
-	movs r1, 0x2D
-	bl GetMonData
-	cmp r0, 0
-	bne _0810F074
-	adds r0, r4, 0
-	movs r1, 0xB
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	lsls r1, r0, 3
-	subs r1, r0
-	lsls r1, 2
-	adds r1, r6
-	ldrb r0, [r1, 0x6]
-	cmp r0, 0xC
-	beq _0810F060
-	ldrb r0, [r1, 0x7]
-	cmp r0, 0xC
-	bne _0810F074
-_0810F060:
-	ldr r1, _0810F070 @ =gScriptResult
-	movs r0, 0x1
-	b _0810F082
-	.align 2, 0
-_0810F068: .4byte gBaseStats
-_0810F06C: .4byte gPlayerParty
-_0810F070: .4byte gScriptResult
-_0810F074:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x5
-	bls _0810F01E
-	ldr r1, _0810F08C @ =gScriptResult
-	movs r0, 0
-_0810F082:
-	strh r0, [r1]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810F08C: .4byte gScriptResult
-	thumb_func_end IsGrassTypeInParty
-
 	thumb_func_start ShowGlassWorkshopMenu
 ShowGlassWorkshopMenu: @ 810F090
 	push {r4,r5,lr}
diff --git a/src/field_specials.c b/src/field_specials.c
index 984ba7714..716043d03 100755
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1410,3 +1410,85 @@ void sub_810EEDC(void)
     }
     BuyMenuFreeMemory();
 }
+
+void SetTrickHouseEndRoomFlag(void)
+{
+    u16 *specVar = &gSpecialVar_0x8004;
+    u16 flag = 0x259;
+    *specVar = flag;
+    FlagSet(flag);
+}
+
+void ResetTrickHouseEndRoomFlag(void)
+{
+    u16 *specVar = &gSpecialVar_0x8004;
+    u16 flag = 0x259;
+    *specVar = flag;
+    FlagReset(flag);
+}
+
+bool8 CheckLeadMonCool(void)
+{
+    if (GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_COOL) < 200)
+    {
+        return FALSE;
+    }
+    return TRUE;
+}
+
+bool8 CheckLeadMonBeauty(void)
+{
+    if (GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_BEAUTY) < 200)
+    {
+        return FALSE;
+    }
+    return TRUE;
+}
+
+bool8 CheckLeadMonCute(void)
+{
+    if (GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_CUTE) < 200)
+    {
+        return FALSE;
+    }
+    return TRUE;
+}
+
+bool8 CheckLeadMonSmart(void)
+{
+    if (GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_SMART) < 200)
+    {
+        return FALSE;
+    }
+    return TRUE;
+}
+
+bool8 CheckLeadMonTough(void)
+{
+    if (GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_TOUGH) < 200)
+    {
+        return FALSE;
+    }
+    return TRUE;
+}
+
+void IsGrassTypeInParty(void)
+{
+    u8 i;
+    u16 species;
+    struct Pokemon *pokemon;
+    for (i=0; i<PARTY_SIZE; i++)
+    {
+        pokemon = &gPlayerParty[i];
+        if (GetMonData(pokemon, MON_DATA_SANITY_BIT2) && !GetMonData(pokemon, MON_DATA_IS_EGG))
+        {
+            species = GetMonData(pokemon, MON_DATA_SPECIES);
+            if (gBaseStats[species].type1 == TYPE_GRASS || gBaseStats[species].type2 == TYPE_GRASS)
+            {
+                gScriptResult = TRUE;
+                return;
+            }
+        }
+    }
+    gScriptResult = FALSE;
+}