Merge pull request #6 from AsparagusEduardo/SortAlternateForms

Sorted by value and added Arceus' forms

1 files changed, 87 insertions, 78 deletions

diff --git a/structs/pokemon.h b/structs/pokemon.h
index 36f17307..b466a11c 100644
--- a/structs/pokemon.h
+++ b/structs/pokemon.h
@@ -6,90 +6,99 @@
 // Enums
 
 typedef enum {
-    EGG=0,
-    EVENT=0,
-    HATCHED=0,
-    PAL_PARK=0,
-    TALL_GRASS=2,
-    DIALGA_GAME_EVENT=4,
-    PALKIA_GAME_EVENT=4,
-    CAVE=5,
-    HALL_OF_ORIGIN=5,
-    SURFING=7,
-    FISHING=7,
-    BUILDING=9,
-    SAFARI_ZONE=10,
-    STARTER=12,
-    FOSSIL=12,
-    GIFT_EEVEE=12
+    EGG = 0,
+    EVENT = 0,
+    HATCHED = 0,
+    PAL_PARK = 0,
+    TALL_GRASS = 2,
+    DIALGA_GAME_EVENT = 4,
+    PALKIA_GAME_EVENT = 4,
+    CAVE = 5,
+    HALL_OF_ORIGIN = 5,
+    SURFING = 7,
+    FISHING = 7,
+    BUILDING = 9,
+    SAFARI_ZONE = 10,
+    STARTER = 12,
+    FOSSIL = 12,
+    GIFT_EEVEE = 12
 } EncounterType;
 
 typedef enum {
-    JAPANESE=1,
-    ENGLISH=2,
-    FRENCH=3,
-    ITALIAN=4,
-    GERMAN=5,
-    SPANISH=7,
-    KOREAN=8
+    JAPANESE = 1,
+    ENGLISH = 2,
+    FRENCH = 3,
+    ITALIAN = 4,
+    GERMAN = 5,
+    SPANISH = 7,
+    KOREAN = 8
 } OriginLanguage;
 
 typedef enum {
-    // TODO: Add all Arceus forms
-    //       and sort by value
-    ARCEUS_EARTH=32,
-    ARCEUS_FIST=8,
-    ARCEUS_NORMAL=0,
-    ARCEUS_SKY=16,
-    ARCEUS_STONE=40,
-    ARCEUS_TOXIC=24,
-    BURMY_PLANT=0,
-    BURMY_SANDY=8,
-    BURMY_TRASH=16,
-    DEOXYS_ATTACK=8,
-    DEOXYS_DEFENSE=16,
-    DEOXYS_NORMAL=0,
-    DEOXYS_SPEED=24,
-    GIRATINA_ALTERED=0,
-    GIRATINA_ORIGIN=8,
-    ROTOM_FAN=32,
-    ROTOM_FROST=24,
-    ROTOM_HEAT=8,
-    ROTOM_MOW=40,
-    ROTOM_NORMAL=0,
-    ROTOM_WASH=16,
-    SHAYMIN_LAND=0,
-    SHAYMIN_SKY=8,
-    SHELLOS_EAST=8,
-    SHELLOS_WEST=0,
-    UNOWN_EXCLAMATIONMARK =208,
-    UNOWN_QUESTIONMARK=216,
-    UNOWN_A=0,
-    UNOWN_B=8,
-    UNOWN_C=16,
-    UNOWN_D=24,
-    UNOWN_E=32,
-    UNOWN_F=40,
-    UNOWN_G=48,
-    UNOWN_H=56,
-    UNOWN_I=64,
-    UNOWN_J=72,
-    UNOWN_K=80,
-    UNOWN_L=88,
-    UNOWN_M=96,
-    UNOWN_N=104,
-    UNOWN_O=112,
-    UNOWN_P=120,
-    UNOWN_Q=128,
-    UNOWN_R=136,
-    UNOWN_S=144,
-    UNOWN_T=152,
-    UNOWN_U=160,
-    UNOWN_V=168,
-    UNOWN_W=176,
-    UNOWN_X=184,
-    UNOWN_Y=192,
-    UNOWN_Z=200
+    ARCEUS_NORMAL = 0,
+    ARCEUS_FIST = 8,
+    ARCEUS_SKY = 16,
+    ARCEUS_TOXIC = 24,
+    ARCEUS_EARTH = 32,
+    ARCEUS_STONE = 40,
+    ARCEUS_INSECT = 48,
+    ARCEUS_SPOOKY = 56,
+    ARCEUS_IRON = 64,
+    ARCEUS_FLAME = 72,
+    ARCEUS_SPLASH = 80,
+    ARCEUS_MEADOW = 88,
+    ARCEUS_ZAP = 96,
+    ARCEUS_MIND = 104,
+    ARCEUS_ICICLE = 112,
+    ARCEUS_DRACO = 120,
+    ARCEUS_DREAD = 128,
+    BURMY_PLANT = 0,
+    BURMY_SANDY = 8,
+    BURMY_TRASH = 16,
+    DEOXYS_NORMAL = 0,
+    DEOXYS_ATTACK = 8,
+    DEOXYS_DEFENSE = 16,
+    DEOXYS_SPEED = 24,
+    GIRATINA_ALTERED = 0,
+    GIRATINA_ORIGIN = 8,
+    ROTOM_NORMAL = 0,
+    ROTOM_HEAT = 8,
+    ROTOM_WASH = 16,
+    ROTOM_FROST = 24,
+    ROTOM_FAN = 32,
+    ROTOM_MOW = 40,
+    SHAYMIN_LAND = 0,
+    SHAYMIN_SKY = 8,
+    SHELLOS_WEST = 0,
+    SHELLOS_EAST = 8,
+    UNOWN_A = 0,
+    UNOWN_B = 8,
+    UNOWN_C = 16,
+    UNOWN_D = 24,
+    UNOWN_E = 32,
+    UNOWN_F = 40,
+    UNOWN_G = 48,
+    UNOWN_H = 56,
+    UNOWN_I = 64,
+    UNOWN_J = 72,
+    UNOWN_K = 80,
+    UNOWN_L = 88,
+    UNOWN_M = 96,
+    UNOWN_N = 104,
+    UNOWN_O = 112,
+    UNOWN_P = 120,
+    UNOWN_Q = 128,
+    UNOWN_R = 136,
+    UNOWN_S = 144,
+    UNOWN_T = 152,
+    UNOWN_U = 160,
+    UNOWN_V = 168,
+    UNOWN_W = 176,
+    UNOWN_X = 184,
+    UNOWN_Y = 192,
+    UNOWN_Z = 200,
+    UNOWN_EXCLAMATION_MARK = 208,
+    UNOWN_QUESTION_MARK = 216
 } AlternateForms;
 
 // Structs