through FUN_02069CF4

4 files changed, 177 insertions, 10 deletions

diff --git a/include/constants/sinnoh_dex.h b/include/constants/sinnoh_dex.h
new file mode 100644
index 00000000..555ced8b
--- /dev/null
+++ b/include/constants/sinnoh_dex.h
@@ -0,0 +1,158 @@
+#ifndef POKEDIAMOND_CONSTANTS_SINNOH_DEX_H
+#define POKEDIAMOND_CONSTANTS_SINNOH_DEX_H
+
+#define SINNOH_DEX_ARCEUS       0
+#define SINNOH_DEX_TURTWIG      1
+#define SINNOH_DEX_GROTLE       2
+#define SINNOH_DEX_TORTERRA     3
+#define SINNOH_DEX_CHIMCHAR     4
+#define SINNOH_DEX_MONFERNO     5
+#define SINNOH_DEX_INFERNAPE    6
+#define SINNOH_DEX_PIPLUP       7
+#define SINNOH_DEX_PRINPLUP     8
+#define SINNOH_DEX_EMPOLEON     9
+#define SINNOH_DEX_STARLY      10
+#define SINNOH_DEX_STARAVIA    11
+#define SINNOH_DEX_STARAPTOR   12
+#define SINNOH_DEX_BIDOOF      13
+#define SINNOH_DEX_BIBAREL     14
+#define SINNOH_DEX_KRICKETOT   15
+#define SINNOH_DEX_KRICKETUNE  16
+#define SINNOH_DEX_SHINX       17
+#define SINNOH_DEX_LUXIO       18
+#define SINNOH_DEX_LUXRAY      19
+#define SINNOH_DEX_ABRA        20
+#define SINNOH_DEX_KADABRA     21
+#define SINNOH_DEX_ALAKAZAM    22
+#define SINNOH_DEX_MAGIKARP    23
+#define SINNOH_DEX_GYARADOS    24
+#define SINNOH_DEX_BUDEW       25
+#define SINNOH_DEX_ROSELIA     26
+#define SINNOH_DEX_ROSERADE    27
+#define SINNOH_DEX_ZUBAT       28
+#define SINNOH_DEX_GOLBAT      29
+#define SINNOH_DEX_CROBAT      30
+#define SINNOH_DEX_GEODUDE     31
+#define SINNOH_DEX_GRAVELER    32
+#define SINNOH_DEX_GOLEM       33
+#define SINNOH_DEX_ONIX        34
+#define SINNOH_DEX_STEELIX     35
+#define SINNOH_DEX_CRANIDOS    36
+#define SINNOH_DEX_RAMPARDOS   37
+#define SINNOH_DEX_SHIELDON    38
+#define SINNOH_DEX_BASTIODON   39
+#define SINNOH_DEX_MACHOP      40
+#define SINNOH_DEX_MACHOKE     41
+#define SINNOH_DEX_MACHAMP     42
+#define SINNOH_DEX_PSYDUCK     43
+#define SINNOH_DEX_GOLDUCK     44
+#define SINNOH_DEX_BURMY       45
+#define SINNOH_DEX_WORMADAM    46
+#define SINNOH_DEX_MOTHIM      47
+#define SINNOH_DEX_WURMPLE     48
+#define SINNOH_DEX_SILCOON     49
+#define SINNOH_DEX_BEAUTIFLY   50
+#define SINNOH_DEX_CASCOON     51
+#define SINNOH_DEX_DUSTOX      52
+#define SINNOH_DEX_COMBEE      53
+#define SINNOH_DEX_VESPIQUEN   54
+#define SINNOH_DEX_PACHIRISU   55
+#define SINNOH_DEX_BUIZEL      56
+#define SINNOH_DEX_FLOATZEL    57
+#define SINNOH_DEX_CHERUBI     58
+#define SINNOH_DEX_CHERRIM     59
+#define SINNOH_DEX_SHELLOS     60
+#define SINNOH_DEX_GASTRODON   61
+#define SINNOH_DEX_HERACROSS   62
+#define SINNOH_DEX_AIPOM       63
+#define SINNOH_DEX_AMBIPOM     64
+#define SINNOH_DEX_DRIFLOON    65
+#define SINNOH_DEX_DRIFBLIM    66
+#define SINNOH_DEX_BUNEARY     67
+#define SINNOH_DEX_LOPUNNY     68
+#define SINNOH_DEX_GASTLY      69
+#define SINNOH_DEX_HAUNTER     70
+#define SINNOH_DEX_GENGAR      71
+#define SINNOH_DEX_MISDREAVUS  72
+#define SINNOH_DEX_MISMAGIUS   73
+#define SINNOH_DEX_MURKROW     74
+#define SINNOH_DEX_HONCHKROW   75
+#define SINNOH_DEX_GLAMEOW     76
+#define SINNOH_DEX_PURUGLY     77
+#define SINNOH_DEX_GOLDEEN     78
+#define SINNOH_DEX_SEAKING     79
+#define SINNOH_DEX_BARBOACH    80
+#define SINNOH_DEX_WHISCASH    81
+#define SINNOH_DEX_CHINGLING   82
+#define SINNOH_DEX_CHIMECHO    83
+#define SINNOH_DEX_STUNKY      84
+#define SINNOH_DEX_SKUNTANK    85
+#define SINNOH_DEX_MEDITITE    86
+#define SINNOH_DEX_MEDICHAM    87
+#define SINNOH_DEX_BRONZOR     88
+#define SINNOH_DEX_BRONZONG    89
+#define SINNOH_DEX_PONYTA      90
+#define SINNOH_DEX_RAPIDASH    91
+#define SINNOH_DEX_BONSLY      92
+#define SINNOH_DEX_SUDOWOODO   93
+#define SINNOH_DEX_MIME_JR     94
+#define SINNOH_DEX_MR_MIME     95
+#define SINNOH_DEX_HAPPINY     96
+#define SINNOH_DEX_CHANSEY     97
+#define SINNOH_DEX_BLISSEY     98
+#define SINNOH_DEX_CLEFFA      99
+#define SINNOH_DEX_CLEFAIRY   100
+#define SINNOH_DEX_CLEFABLE   101
+#define SINNOH_DEX_CHATOT     102
+#define SINNOH_DEX_PICHU      103
+#define SINNOH_DEX_PIKACHU    104
+#define SINNOH_DEX_RAICHU     105
+#define SINNOH_DEX_HOOTHOOT   106
+#define SINNOH_DEX_NOCTOWL    107
+#define SINNOH_DEX_SPIRITOMB  108
+#define SINNOH_DEX_GIBLE      109
+#define SINNOH_DEX_GABITE     110
+#define SINNOH_DEX_GARCHOMP   111
+#define SINNOH_DEX_MUNCHLAX   112
+#define SINNOH_DEX_SNORLAX    113
+#define SINNOH_DEX_UNOWN      114
+#define SINNOH_DEX_RIOLU      115
+#define SINNOH_DEX_LUCARIO    116
+#define SINNOH_DEX_WOOPER     117
+#define SINNOH_DEX_QUAGSIRE   118
+#define SINNOH_DEX_WINGULL    119
+#define SINNOH_DEX_PELIPPER   120
+#define SINNOH_DEX_GIRAFARIG  121
+#define SINNOH_DEX_HIPPOPOTAS 122
+#define SINNOH_DEX_HIPPOWDON  123
+#define SINNOH_DEX_AZURILL    124
+#define SINNOH_DEX_MARILL     125
+#define SINNOH_DEX_AZUMARILL  126
+#define SINNOH_DEX_SKORUPI    127
+#define SINNOH_DEX_DRAPION    128
+#define SINNOH_DEX_CROAGUNK   129
+#define SINNOH_DEX_TOXICROAK  130
+#define SINNOH_DEX_CARNIVINE  131
+#define SINNOH_DEX_REMORAID   132
+#define SINNOH_DEX_OCTILLERY  133
+#define SINNOH_DEX_FINNEON    134
+#define SINNOH_DEX_LUMINEON   135
+#define SINNOH_DEX_TENTACOOL  136
+#define SINNOH_DEX_TENTACRUEL 137
+#define SINNOH_DEX_FEEBAS     138
+#define SINNOH_DEX_MILOTIC    139
+#define SINNOH_DEX_MANTYKE    140
+#define SINNOH_DEX_MANTINE    141
+#define SINNOH_DEX_SNOVER     142
+#define SINNOH_DEX_ABOMASNOW  143
+#define SINNOH_DEX_SNEASEL    144
+#define SINNOH_DEX_WEAVILE    145
+#define SINNOH_DEX_UXIE       146
+#define SINNOH_DEX_MESPRIT    147
+#define SINNOH_DEX_AZELF      148
+#define SINNOH_DEX_DIALGA     149
+#define SINNOH_DEX_PALKIA     150
+#define SINNOH_DEX_MANAPHY    151
+#define SINNOH_DEX_COUNT SINNOH_DEX_MANAPHY
+
+#endif //POKEDIAMOND_CONSTANTS_SINNOH_DEX_H
diff --git a/include/party.h b/include/party.h
new file mode 100644
index 00000000..b6065a3f
--- /dev/null
+++ b/include/party.h
@@ -0,0 +1,19 @@
+#ifndef POKEDIAMOND_PARTY_H
+#define POKEDIAMOND_PARTY_H
+
+#include "pokemon.h"
+
+#define PARTY_SIZE 6
+
+struct PlayerParty
+{
+    u32 maxCount;
+    u32 curCount;
+    struct Pokemon mons[PARTY_SIZE];
+};
+
+BOOL PartyHasMon(struct PlayerParty * party_p, u16 species);
+int GetPartyCount(struct PlayerParty * party_p);
+struct Pokemon * GetPartyMonByIndex(struct PlayerParty * party_p, int idx);
+
+#endif //POKEDIAMOND_PARTY_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 83630d39..166a1c7e 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -537,15 +537,6 @@ struct Evolution
     u16 target;
 };
 
-#define PARTY_SIZE 6
-
-struct PlayerParty
-{
-    u32 maxCount;
-    u32 curCount;
-    struct Pokemon mons[PARTY_SIZE];
-};
-
 void ZeroMonData(struct Pokemon * pokemon);
 void ZeroBoxMonData(struct BoxPokemon * boxmon);
 u32 SizeOfStructPokemon(void);
diff --git a/include/proto.h b/include/proto.h
index d9a5ec2a..d26b7750 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -17,6 +17,5 @@ u32 GetArceusTypeByPlate(u16 plate);
 int FUN_02014C3C(u8);
 void FUN_02014C54(int, int, struct UnkStruct_02069038 *, u8);
 u32 IsNighttime(void); // is day or night
-u32 PartyHasMon(struct PlayerParty *, u16);
 
 #endif //POKEDIAMOND_PROTO_H