Merge branch 'master' into master

52 files changed, 2661 insertions, 1908 deletions

diff --git a/.travis.yml b/.travis.yml
index 9c60702e..32b091c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,6 @@ cache:
 install:
     # These files are only accessible from Travis CI IP Addresses to prevent piracy.
     - wget http://private.martmists.com/mwccarm.zip
-    - wget http://private.martmists.com/baserom.nds
     - wget http://private.martmists.com/nitro.zip
     - unzip mwccarm.zip
     - mv mwccarm tools
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 256485ba..f1d54918 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ add_compile_options(-fms-extensions)
 file(GLOB_RECURSE SOURCES RELATIVE ${CMAKE_SOURCE_DIR} "*.c" "*.cpp")
 
 add_executable(PokeDiamond ${SOURCES})
-target_include_directories(PokeDiamond PRIVATE include include-mw arm9/lib/include)
+target_include_directories(PokeDiamond PRIVATE include include-mw arm9/lib/include arm7/lib/include)
 
 add_executable(calcrom .travis/calcrom/calcrom.cpp)
 target_include_directories(calcrom PRIVATE /usr/local/include)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 397bdf95..d8e2b89c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -105,11 +105,11 @@ OBJDUMP_MODE="${OBJDUMP_MODE:-force-thumb}"
 OBJDUMP_VMA="${OBJDUMP_VMA:-0x02000000}"
 OBJDUMP="arm-none-eabi-objdump -Drz -bbinary -m${OBJDUMP_ARCH} -M${OBJDUMP_MODE}"
 OPTIONS="--start-address=$(($1 + OBJDUMP_VMA)) --stop-address=$(($1 + $2 + OBJDUMP_VMA))"
-$OBJDUMP $OPTIONS baserom.sbin > baserom.dump || exit 1
-$OBJDUMP $OPTIONS build/arm9.sbin > arm9.dump
-diff -u baserom.dump arm9.dump
+$OBJDUMP $OPTIONS $(dirname $0)/baserom.sbin > $(dirname $0)/baserom.dump || exit 1
+$OBJDUMP $OPTIONS $(dirname $0)/build/arm9.sbin > $(dirname $0)/arm9.dump
+diff -u $(dirname $0)/baserom.dump $(dirname $0)/arm9.dump
 ```
-Place a clean version of the ARM9 binary as arm9/baserom.sbin. In your terminal, navigate to the arm9 directory and run `./asmdiff.sh 0 $(wc -c baserom.sbin) | less`, then scroll through to where the grievances begin. Fix any obvious problems in your code/tree, and rerun. If the differences are extensive, you may have induced a shift in the binary either by writing incorrect code or placing it incorrectly into the LCF.  *Tip: you can specify a start address and size to only compare the portion of the ROM you are working on.*
+Place a clean version of the ARM9 binary as arm9/baserom.sbin (arm9/build/arm9.bin from a successful build should suffice). In your terminal, navigate to the arm9 directory and run `./asmdiff.sh 0 $(wc -c baserom.sbin) | less`, then scroll through to where the grievances begin. Fix any obvious problems in your code/tree, and rerun. If the differences are extensive, you may have induced a shift in the binary either by writing incorrect code or placing it incorrectly into the LCF.  *Tip: you can specify a start address and size to only compare the portion of the ROM you are working on.*
 
 ## Decompiling data
 
diff --git a/INSTALL.md b/INSTALL.md
index ca080afb..ce7e02fc 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,18 +1,14 @@
-### 1. Copy baserom(s) into root folder
-
-Put a clean copy of Pokemon Diamond (US) nds rom at `./baserom.nds`.
-
-### 2. Install MWCC compiler
+### 1. Install MWCC compiler
 
 The build system requires the use of the Metrowerk C Compiler 2.0/base to compile matching files. We cannot distribute the correct compiler here so join the PRET discord and download the pinned mwccarm.zip zip in #pokediamond and extract it to tools/. Run each of the executables so they ask for a license.dat and provide the one in the rar (it may also ask for it when compiling). This only needs to be done once.
 
 In the future, a GCC option will be available so MWCC is not required to build, however it is required for a matching ROM.
 
-### 3. Install Nitro SDK
+### 2. Install Nitro SDK
 
 As with the compiler, the Nitro SDK is proprietary and cannot be distributed here. Opened the pinned Mega folder in the PRET discord and download "NITRO SDK v3.0.zip" and "NITRO SDK V3.0 Plus 2.zip" from the "SDK System Libraries" folder. Extract v3.0.zip into a separate folder, then extract v3.0 Plus 2.zip into the same folder, overwriting when prompted. Copy the contents of tools/bin from the Nitro SDK to tools/bin in your pokediamond clone. Finally, copy include/nitro/specfiles/ARM7-TS.lcf.template into the arm7 subdirectory, and include/nitro/specfiles/ARM9-TS.lcf.template into the arm9 subdirectory.
 
-### 4. Dependencies
+### 3. Dependencies
 
 #### Linux
 
@@ -48,7 +44,7 @@ You will still require the following packages:
 
 Install them using either the Cygwin package manager or using pacman on Msys2.
 
-### 5. Build ROM
+### 4. Build ROM
 
 Run `make` to build the ROM.
 
diff --git a/Makefile b/Makefile
index 63b46934..63a5a1a7 100644
--- a/Makefile
+++ b/Makefile
@@ -32,9 +32,19 @@ endif
 ifeq ($(OS),Windows_NT)
 EXE := .exe
 WINE :=
+GREP := grep -P
+SED := sed -r
 else
 EXE :=
 WINE := wine
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Darwin)
+GREP := grep -E
+SED := perl -p -e
+else
+GREP := grep -P
+SED := sed -r
+endif
 endif
 
 ifeq ($(NOWINE),1)
@@ -333,7 +343,7 @@ $(BUILD_DIR)/pokediamond_bnr.bin: pokediamond.bsf graphics/icon.4bpp graphics/ic
 	$(MAKEBANNER) $< $@
 
 symbols.csv: arm9 arm7
-	(echo "Name,Location"; grep -P " *[0-9A-F]{8} [0-9A-F]{8} \S+ +\w+\t\(\w+\.o\)" arm9/build/arm9.elf.xMAP arm7/build/arm7.elf.xMAP | sed -r 's/ *([0-9A-F]{8}) [0-9A-F]{8} \S+ +(\w+)\t\(\w+\.o\)/\2,\1/g' | cut -d: -f2) > $@
+	(echo "Name,Location"; $(GREP) " *[0-9A-F]{8} [0-9A-F]{8} \S+ +\w+\t\(\w+\.o\)" arm9/build/arm9.elf.xMAP arm7/build/arm7.elf.xMAP | $(SED) 's/ *([0-9A-F]{8}) [0-9A-F]{8} \S+ +(\w+)\t\(\w+\.o\)/\2,\1/g' | cut -d: -f2) > $@
 
 ### Debug Print ###
 
diff --git a/README.md b/README.md
index 57d05e9a..1b652438 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,8 @@ It builds the following ROM:
 
 To set up the repository, see [INSTALL.md](INSTALL.md).
 
+For contributor instructions, see [CONTRIBUTING.md](CONTRIBUTING.md).
+
 ## See also
 
 Other disassembly and/or decompilation projects:
diff --git a/arm7/Makefile b/arm7/Makefile
index 1ade0ed4..1b0cd3c3 100644
--- a/arm7/Makefile
+++ b/arm7/Makefile
@@ -196,7 +196,6 @@ DUMMY != mkdir -p $(ALL_DIRS)
 %.pal: ;
 
 # Included files
-baserom.%: ;
 %.h: ;
 %.inc: ;
 
diff --git a/arm7/lib/include/MI_memory.h b/arm7/lib/include/MI_memory.h
index cb0c53fc..53398ec5 100644
--- a/arm7/lib/include/MI_memory.h
+++ b/arm7/lib/include/MI_memory.h
@@ -12,4 +12,14 @@ void MIi_CpuCopyFast(register u32 * src, register u32 * dst, register u32 size);
 void MI_CpuFill8(register u8 value, register u8 * dst, register u32 size);
 void MI_CpuCopy8(register u8 * src, register u8 * dst, register u32 size);
 
+static inline void MI_CpuFill32(void *dest, u32 data, u32 size)
+{
+    MIi_CpuClear32(data, dest, size);
+}
+
+static inline void MI_CpuClear32(void *dest, u32 size)
+{
+    MI_CpuFill32(dest, 0, size);
+}
+
 #endif
diff --git a/arm7/lib/include/OS_alarm.h b/arm7/lib/include/OS_alarm.h
new file mode 100644
index 00000000..8ae89e97
--- /dev/null
+++ b/arm7/lib/include/OS_alarm.h
@@ -0,0 +1,9 @@
+#ifndef POKEDIAMOND_ARM7_OS_ALARM_H
+#define POKEDIAMOND_ARM7_OS_ALARM_H
+
+#include "nitro/OS_alarm_shared.h"
+
+void OS_CreateAlarm(OSAlarm *alarm);
+void OS_SetAlarm(OSAlarm *alarm, OSTick tick, OSAlarmHandler handler, void *arg);
+
+#endif //POKEDIAMOND_ARM7_OS_ALARM_H
diff --git a/arm7/lib/include/OS_context.h b/arm7/lib/include/OS_context.h
index 7819e29c..b01ccb8b 100644
--- a/arm7/lib/include/OS_context.h
+++ b/arm7/lib/include/OS_context.h
@@ -13,4 +13,8 @@ typedef struct OSContext
     u32 sp_svc;
 } OSContext;
 
+extern u32 OS_SaveContext(OSContext *context);
+extern void OS_LoadContext(OSContext *context);
+extern void OS_InitContext(OSContext *context, u32 func, u32 stack);
+
 #endif //POKEDIAMOND_ARM7_OS_CONTEXT_H
diff --git a/arm7/lib/include/OS_mutex.h b/arm7/lib/include/OS_mutex.h
new file mode 100644
index 00000000..b41ac9f8
--- /dev/null
+++ b/arm7/lib/include/OS_mutex.h
@@ -0,0 +1,9 @@
+#ifndef POKEDIAMOND_ARM7_OS_MUTEX_H
+#define POKEDIAMOND_ARM7_OS_MUTEX_H
+
+#include "OS_context.h"
+#include "nitro/OS_mutex_shared.h"
+
+void OSi_UnlockAllMutex(OSThread * thread);
+
+#endif //POKEDIAMOND_ARM7_OS_MUTEX_H
diff --git a/arm7/lib/include/OS_thread.h b/arm7/lib/include/OS_thread.h
index 04e4fdcb..b1d3a01b 100644
--- a/arm7/lib/include/OS_thread.h
+++ b/arm7/lib/include/OS_thread.h
@@ -4,4 +4,33 @@
 #include "OS_context.h"
 #include "nitro/OS_thread_shared.h"
 
+static s32 OSi_GetUnusedThreadId(void);
+static void OSi_InsertLinkToQueue(OSThreadQueue *queue, OSThread *thread);
+static OSThread *OSi_RemoveLinkFromQueue(OSThreadQueue *queue);
+static OSThread *OSi_RemoveSpecifiedLinkFromQueue(OSThreadQueue *queue, OSThread *thread);
+OSMutex *OSi_RemoveMutexLinkFromQueue(OSMutexQueue *queue);
+static void OSi_InsertThreadToList(OSThread *thread);
+static void OSi_RemoveThreadFromList(OSThread *thread);
+static void OSi_RescheduleThread(void);
+void OS_InitThread(void);
+void OS_CreateThread(OSThread *thread, void (*func) (void *), void *arg, void *stack, u32 stackSize, u32 prio);
+void OS_ExitThread(void);
+static void OSi_ExitThread_ArgSpecified(OSThread *thread, void *arg);
+static void OSi_ExitThread(void *arg);
+static void OSi_ExitThread_Destroy(void);
+void OS_JoinThread(OSThread *thread);
+BOOL OS_IsThreadTerminated(const OSThread *thread);
+void OS_SleepThread(OSThreadQueue *queue);
+void OS_WakeupThread(OSThreadQueue *queue);
+void OS_WakeupThreadDirect(OSThread *thread);
+OSThread *OS_SelectThread(void);
+void OS_RescheduleThread(void);
+BOOL OS_SetThreadPriority(OSThread *thread, u32 prio);
+void OS_Sleep(u32 msec);
+static void OSi_SleepAlarmCallback(void *arg);
+OSSwitchThreadCallback OS_SetSwitchThreadCallback(OSSwitchThreadCallback callback);
+u32 OS_DisableScheduler(void);
+u32 OS_EnableScheduler(void);
+void OS_SetThreadDestructor(OSThread *thread, OSThreadDestructor dtor);
+
 #endif //POKEDIAMOND_ARM7_OS_THREAD_H
diff --git a/arm7/lib/include/consts.h b/arm7/lib/include/consts.h
index 966b5a4b..a6c4c393 100644
--- a/arm7/lib/include/consts.h
+++ b/arm7/lib/include/consts.h
@@ -4,5 +4,6 @@
 #include "nitro/consts_shared.h"
 #include "mmap.h"
 #include "registers.h"
+#include "systemWork.h"
 
 #endif //POKEDIAMOND_ARM7_CONSTS_H
diff --git a/arm7/lib/include/systemWork.h b/arm7/lib/include/systemWork.h
new file mode 100644
index 00000000..95a17845
--- /dev/null
+++ b/arm7/lib/include/systemWork.h
@@ -0,0 +1,7 @@
+#ifndef POKEDIAMOND_ARM7_SYSTEMWORK_H
+#define POKEDIAMOND_ARM7_SYSTEMWORK_H
+
+#include "OS_context.h"
+#include "nitro/OS_systemWork_shared.h"
+
+#endif //POKEDIAMOND_ARM7_SYSTEMWORK_H
diff --git a/arm7/lib/src/OS_thread.c b/arm7/lib/src/OS_thread.c
new file mode 100644
index 00000000..be3f611d
--- /dev/null
+++ b/arm7/lib/src/OS_thread.c
@@ -0,0 +1,597 @@
+#include "OS_thread.h"
+#include "function_target.h"
+#include "OS_system.h"
+#include "consts.h"
+#include "OS_terminate_proc.h"
+#include "OS_mutex.h"
+#include "OS_alarm.h"
+#include "OS_context.h"
+#include "nitro/OS_systemWork_shared.h"
+#include "MI_memory.h"
+
+extern void SDK_SYS_STACKSIZE(void);
+extern void SDK_IRQ_STACKSIZE(void);
+
+u32 OSi_RescheduleCount = 0;
+
+void *OSi_StackForDestructor = NULL;
+
+OSThreadInfo OSi_ThreadInfo;
+
+BOOL OSi_IsThreadInitialized = FALSE;
+
+OSThread **OSi_CurrentThreadPtr = NULL;
+
+void *OSi_SystemCallbackInSwitchThread = NULL;
+
+static s32 OSi_ThreadIdCount = 0;
+
+OSThread OSi_LauncherThread;
+OSThread OSi_IdleThread;
+
+ARM_FUNC static s32 OSi_GetUnusedThreadId(void)
+{
+    return ++OSi_ThreadIdCount;
+}
+
+ARM_FUNC static void OSi_InsertLinkToQueue(OSThreadQueue *queue, OSThread *thread)
+{
+    OSThread *next = queue->head;
+
+    while (next && next->priority <= thread->priority)
+    {
+        if (next == thread)
+            return;
+        next = next->link.next;
+    }
+
+    if (!next)
+    {
+        OSThread *prev = queue->tail;
+
+        if (!prev)
+        {
+            queue->head = thread;
+        }
+        else
+        {
+            prev->link.next = thread;
+        }
+
+        thread->link.prev = prev;
+        thread->link.next = NULL;
+        queue->tail = thread;
+    }
+    else
+    {
+        OSThread *prev = next->link.prev;
+
+        if (!prev)
+        {
+            queue->head = thread;
+        }
+        else
+        {
+            prev->link.next = thread;
+        }
+
+        thread->link.prev = prev;
+        thread->link.next = next;
+        next->link.prev = thread;
+    }
+}
+
+ARM_FUNC static OSThread *OSi_RemoveLinkFromQueue(OSThreadQueue *queue)
+{
+    OSThread *thread = queue->head;
+
+    if (thread)
+    {
+        OSThread *next = thread->link.next;
+
+        queue->head = next;
+
+        if (next)
+        {
+            next->link.prev = NULL;
+        }
+        else
+        {
+            queue->tail = NULL;
+            thread->queue = NULL;
+        }
+    }
+
+    return thread;
+}
+
+ARM_FUNC static OSThread *OSi_RemoveSpecifiedLinkFromQueue(OSThreadQueue *queue, OSThread *thread)
+{
+    OSThread *queueHead = queue->head;
+
+    while (queueHead)
+    {
+        OSThread *next = queueHead->link.next;
+
+        if (queueHead == thread)
+        {
+            OSThread *prev = queueHead->link.prev;
+
+            if (queue->head == queueHead)
+            {
+                queue->head = next;
+            }
+            else
+            {
+                prev->link.next = next;
+            }
+
+            if (queue->tail == queueHead)
+            {
+                queue->tail = prev;
+            }
+            else
+            {
+                next->link.prev = prev;
+            }
+
+            break;
+        }
+
+        queueHead = next;
+    }
+
+    return queueHead;
+}
+
+ARM_FUNC OSMutex *OSi_RemoveMutexLinkFromQueue(OSMutexQueue *queue)
+{
+    OSMutex *mutexHead = queue->head;
+
+    if (mutexHead)
+    {
+        OSMutex *next = mutexHead->link.next;
+
+        queue->head = next;
+
+        if (next)
+        {
+            next->link.prev = NULL;
+        }
+        else
+        {
+            queue->tail = NULL;
+        }
+    }
+
+    return mutexHead;
+}
+
+ARM_FUNC static void OSi_InsertThreadToList(OSThread *thread)
+{
+    OSThread *t = OSi_ThreadInfo.list;
+    OSThread *pre = NULL;
+
+    while(t && t->priority < thread->priority)
+    {
+        pre = t;
+        t = t->next;
+    }
+
+    if (!pre)
+    {
+        thread->next = OSi_ThreadInfo.list;
+        OSi_ThreadInfo.list = thread;
+    }
+    else
+    {
+        thread->next = pre->next;
+        pre->next = thread;
+    }
+}
+
+ARM_FUNC static void OSi_RemoveThreadFromList(OSThread *thread)
+{
+    OSThread *t = OSi_ThreadInfo.list;
+    OSThread *pre = NULL;
+
+    while (t && t != thread)
+    {
+        pre = t;
+        t = t-> next;
+    }
+
+    if (!pre)
+    {
+        OSi_ThreadInfo.list = thread->next;
+    }
+    else
+    {
+        pre->next = thread->next;
+    }
+}
+
+ARM_FUNC static void OSi_RescheduleThread(void)
+{
+    if (OSi_RescheduleCount <= 0)
+    {
+        OSThreadInfo *info = &OSi_ThreadInfo;
+        if (info->irqDepth > 0 || OS_GetProcMode() == OS_PROCMODE_IRQ)
+        {
+            info->isNeedRescheduling = TRUE;
+        }
+        else
+        {
+            OSThread *currentThread = OSi_GetCurrentThread();
+            OSThread *nextThread = OS_SelectThread();
+
+            if (currentThread == nextThread || !nextThread)
+                return;
+
+            if (currentThread->state != OS_THREAD_STATE_TERMINATED
+                && OS_SaveContext(&currentThread->context))
+                return;
+
+            if (OSi_SystemCallbackInSwitchThread)
+            {
+                ((OSSwitchThreadCallback)OSi_SystemCallbackInSwitchThread) (currentThread, nextThread);
+            }
+
+            if (info->switchCallback)
+            {
+                ((OSSwitchThreadCallback)info->switchCallback) (currentThread, nextThread);
+            }
+
+            OS_SetCurrentThread(nextThread);
+
+            OS_LoadContext(&nextThread->context);
+        }
+    }
+}
+
+ARM_FUNC void OS_InitThread(void)
+{
+    if (OSi_IsThreadInitialized)
+        return;
+    OSi_IsThreadInitialized = TRUE;
+
+    OSi_CurrentThreadPtr = &(OSi_ThreadInfo.current);
+
+    OSi_LauncherThread.priority = OS_THREAD_LAUNCHER_PRIORITY;
+    OSi_LauncherThread.id = 0;
+    OSi_LauncherThread.state = OS_THREAD_STATE_READY;
+    OSi_LauncherThread.next = NULL;
+
+    OSi_LauncherThread.profiler = NULL;
+
+    OSi_ThreadInfo.list = &OSi_LauncherThread;
+
+    OS_SetCurrentThread(&OSi_LauncherThread);
+
+    void *stackLo = (((s32)SDK_SYS_STACKSIZE) <= 0) ?
+                    (void *)((u32)HW_WRAM - (s32)SDK_SYS_STACKSIZE) :
+                    (void *)((u32)(HW_PRV_WRAM_IRQ_STACK_END - (s32)SDK_IRQ_STACKSIZE) - (s32)SDK_SYS_STACKSIZE);
+
+    OSi_LauncherThread.stackBottom = (u32)(HW_PRV_WRAM_IRQ_STACK_END - (s32)SDK_IRQ_STACKSIZE);
+    OSi_LauncherThread.stackTop = (u32)stackLo;
+    OSi_LauncherThread.stackWarningOffset = 0;
+
+    //checksums
+    *(u32 *)(OSi_LauncherThread.stackBottom - sizeof(u32)) = 0xd73bfdf7UL;
+    *(u32 *)OSi_LauncherThread.stackTop = 0xfbdd37bbUL;
+
+    OS_InitThreadQueue(&OSi_LauncherThread.joinQueue);
+
+    OSi_ThreadInfo.isNeedRescheduling = FALSE;
+    OSi_ThreadInfo.irqDepth = 0;
+
+    OS_GetSystemWork()->threadinfo_subp = &OSi_ThreadInfo;
+
+    (void)OS_SetSwitchThreadCallback(NULL);
+}
+
+ARM_FUNC void OS_CreateThread(OSThread *thread, void (*func) (void *), void *arg, void *stack, u32 stackSize, u32 prio)
+{
+    OSIntrMode enable = OS_DisableInterrupts();
+
+    s32 index = OSi_GetUnusedThreadId();
+
+    thread->priority = prio;
+    thread->id = (u32)index;
+    thread->state = OS_THREAD_STATE_WAITING;
+
+    thread->profiler = NULL;
+
+    OSi_InsertThreadToList(thread);
+
+    thread->stackBottom = (u32)stack;
+    thread->stackTop = (u32)stack - stackSize;
+    thread->stackWarningOffset = 0;
+
+    *(u32 *)(thread->stackBottom - sizeof(u32)) = 0xd73bfdf7UL;
+    *(u32 *)thread->stackTop = 0xfbdd37bbUL;
+
+    OS_InitThreadQueue(&thread->joinQueue);
+
+    OS_InitContext(&thread->context, (u32)func, (u32)stack - 4);
+
+    thread->context.r[0] = (u32)arg;
+    thread->context.lr = (u32)OS_ExitThread;
+
+    MI_CpuClear32((void *)((u32)stack - stackSize + 4), stackSize - 8);
+
+    thread->mutex = NULL;
+    thread->mutexQueue.head = NULL;
+    thread->mutexQueue.tail = NULL;
+
+    OS_SetThreadDestructor(thread, NULL);
+
+    thread->queue = NULL;
+    thread->link.prev = thread->link.next = NULL;
+
+    MI_CpuClear32(&thread->specific[0], sizeof(void *) * OS_THREAD_SPECIFIC_MAX);
+
+    thread->alarmForSleep = NULL;
+
+    (void)OS_RestoreInterrupts(enable);
+}
+
+ARM_FUNC void OS_ExitThread(void)
+{
+    (void)OS_DisableInterrupts();
+    OSi_ExitThread_ArgSpecified(OS_GetCurrentThread(), 0);
+}
+
+ARM_FUNC static void OSi_ExitThread_ArgSpecified(OSThread *thread, void *arg)
+{
+    if (OSi_StackForDestructor)
+    {
+        OS_InitContext(&thread->context, (u32)OSi_ExitThread, (u32)OSi_StackForDestructor);
+        thread->context.r[0] = (u32)arg;
+        thread->context.cpsr |= HW_PSR_DISABLE_IRQ;
+        thread->state = OS_THREAD_STATE_READY;
+        OS_LoadContext(&thread->context);
+    }
+    else
+    {
+        OSi_ExitThread(arg);
+    }
+}
+
+ARM_FUNC static void OSi_ExitThread(void *arg)
+{
+    OSThread *currentThread = OSi_GetCurrentThread();
+    OSThreadDestructor destructor = currentThread->destructor;
+
+    if (destructor)
+    {
+        currentThread->destructor = NULL;
+        destructor(arg);
+        (void)OS_DisableInterrupts();
+    }
+
+    OSi_ExitThread_Destroy();
+}
+
+ARM_FUNC static void OSi_ExitThread_Destroy(void)
+{
+    OSThread *currentThread = OSi_GetCurrentThread();
+    (void)OS_DisableScheduler();
+
+    OSi_UnlockAllMutex(currentThread);
+
+    if (currentThread->queue)
+    {
+        (void)OSi_RemoveSpecifiedLinkFromQueue(currentThread->queue, currentThread);
+    }
+
+    OSi_RemoveThreadFromList(currentThread);
+
+    currentThread->state = OS_THREAD_STATE_TERMINATED;
+
+    OS_WakeupThread(&currentThread->joinQueue);
+
+    (void)OS_EnableScheduler();
+
+    OS_RescheduleThread();
+
+    OS_Terminate();
+}
+
+ARM_FUNC void OS_JoinThread(OSThread *thread)
+{
+    OSIntrMode enabled = OS_DisableInterrupts();
+
+    if (thread->state != OS_THREAD_STATE_TERMINATED)
+    {
+        OS_SleepThread(&thread->joinQueue);
+    }
+
+    (void)OS_RestoreInterrupts(enabled);
+}
+
+ARM_FUNC BOOL OS_IsThreadTerminated(const OSThread *thread)
+{
+    return (thread->state == OS_THREAD_STATE_TERMINATED) ? TRUE : FALSE;
+}
+
+ARM_FUNC void OS_SleepThread(OSThreadQueue *queue)
+{
+    OSIntrMode enabled = OS_DisableInterrupts();
+    OSThread *currentThread = OSi_GetCurrentThread();
+
+    if (queue)
+    {
+        currentThread->queue = queue;
+        OSi_InsertLinkToQueue(queue, currentThread);
+    }
+
+    currentThread->state = OS_THREAD_STATE_WAITING;
+    OSi_RescheduleThread();
+
+    (void)OS_RestoreInterrupts(enabled);
+}
+
+ARM_FUNC void OS_WakeupThread(OSThreadQueue *queue)
+{
+    OSIntrMode enabled = OS_DisableInterrupts();
+
+    if (queue->head)
+    {
+        while (queue->head)
+        {
+            OSThread *thread = OSi_RemoveLinkFromQueue(queue);
+
+            thread->state = OS_THREAD_STATE_READY;
+            thread->queue = NULL;
+            thread->link.prev = thread->link.next = NULL;
+        }
+
+        OS_InitThreadQueue(queue);
+        OSi_RescheduleThread();
+    }
+
+    (void)OS_RestoreInterrupts(enabled);
+}
+
+ARM_FUNC void OS_WakeupThreadDirect(OSThread *thread)
+{
+    OSIntrMode enabled = OS_DisableInterrupts();
+
+    thread->state = OS_THREAD_STATE_READY;
+    OSi_RescheduleThread();
+
+    (void)OS_RestoreInterrupts(enabled);
+}
+
+ARM_FUNC OSThread *OS_SelectThread(void)
+{
+    OSThread *thread = OSi_ThreadInfo.list;
+
+    while (thread && !OS_IsThreadRunnable(thread))
+    {
+        thread = thread->next;
+    }
+
+    return thread;
+}
+
+ARM_FUNC void OS_RescheduleThread(void)
+{
+    OSIntrMode enabled = OS_DisableInterrupts();
+    OSi_RescheduleThread();
+    (void)OS_RestoreInterrupts(enabled);
+}
+
+ARM_FUNC BOOL OS_SetThreadPriority(OSThread *thread, u32 prio)
+{
+    OSThread *t = OSi_ThreadInfo.list;
+    OSThread *pre = NULL;
+    OSIntrMode enabled = OS_DisableInterrupts();
+
+    while (t && t != thread)
+    {
+        pre = t;
+        t = t->next;
+    }
+
+    if (!t || t == &OSi_IdleThread)
+    {
+        (void)OS_RestoreInterrupts(enabled);
+        return FALSE;
+    }
+
+    if (t->priority != prio)
+    {
+        if (!pre)
+        {
+            OSi_ThreadInfo.list = thread->next;
+        }
+        else
+        {
+            pre->next = thread->next;
+        }
+
+        thread->priority = prio;
+        OSi_InsertThreadToList(thread);
+
+        OSi_RescheduleThread();
+    }
+
+    (void)OS_RestoreInterrupts(enabled);
+
+    return TRUE;
+}
+
+ARM_FUNC void OS_Sleep(u32 msec)
+{
+    OSAlarm alarm;
+
+    OS_CreateAlarm(&alarm);
+    OSThread *volatile p_thread = OSi_GetCurrentThread();
+    OSIntrMode enabled = OS_DisableInterrupts();
+
+    p_thread->alarmForSleep = &alarm;
+
+    OS_SetAlarm(&alarm, OS_MilliSecondsToTicks(msec), &OSi_SleepAlarmCallback,
+                (void*)&p_thread);
+    while (p_thread != NULL)
+    {
+        OS_SleepThread(NULL);
+    }
+    (void)OS_RestoreInterrupts(enabled);
+}
+
+ARM_FUNC static void OSi_SleepAlarmCallback(void *arg)
+{
+    OSThread **pp_thread = (OSThread **)arg;
+    OSThread *p_thread = *pp_thread;
+    *pp_thread = NULL;
+
+    p_thread->alarmForSleep = NULL;
+
+    OS_WakeupThreadDirect(p_thread);
+}
+
+ARM_FUNC OSSwitchThreadCallback OS_SetSwitchThreadCallback(OSSwitchThreadCallback callback)
+{
+    OSIntrMode enabled = OS_DisableInterrupts();
+    OSSwitchThreadCallback prev = OSi_ThreadInfo.switchCallback;
+    OSi_ThreadInfo.switchCallback = callback;
+
+    (void)OS_RestoreInterrupts(enabled);
+    return prev;
+}
+
+ARM_FUNC u32 OS_DisableScheduler(void)
+{
+    OSIntrMode enabled = OS_DisableInterrupts();
+    u32 count;
+
+    if (OSi_RescheduleCount < (u32)-1)
+    {
+        count = OSi_RescheduleCount++;
+    }
+    (void)OS_RestoreInterrupts(enabled);
+
+    return count;
+}
+
+ARM_FUNC u32 OS_EnableScheduler(void)
+{
+    OSIntrMode enabled = OS_DisableInterrupts();
+    u32 count = 0;
+
+    if (OSi_RescheduleCount > 0)
+    {
+        count = OSi_RescheduleCount--;
+    }
+    (void)OS_RestoreInterrupts(enabled);
+
+    return count;
+}
+
+ARM_FUNC void OS_SetThreadDestructor(OSThread *thread, OSThreadDestructor dtor)
+{
+    thread->destructor = dtor;
+}
diff --git a/arm9/Makefile b/arm9/Makefile
index 5d8741ba..65f2cc00 100644
--- a/arm9/Makefile
+++ b/arm9/Makefile
@@ -309,7 +309,6 @@ DUMMY != mkdir -p $(ALL_DIRS)
 %.pal: ;
 
 # Included files
-baserom.%: ;
 %.h: ;
 %.inc: ;
 
diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf
index 5612df2a..8150b54e 100644
--- a/arm9/arm9.lcf
+++ b/arm9/arm9.lcf
@@ -400,7 +400,7 @@ SECTIONS {
 		unk_020842D0.o (.text)
 		unk_020842DC.o (.text)
 		unk_020851B8.o (.text)
-		unk_02085258.o (.text)
+		nutdata.o (.text)
 		unk_02085338.o (.text)
 		unk_020854E0.o (.text)
 		unk_020859C0.o (.text)
diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s
index 078e899f..f8ec8636 100644
--- a/arm9/asm/scrcmd_4.s
+++ b/arm9/asm/scrcmd_4.s
@@ -790,7 +790,7 @@ FUN_02040D04: ; 0x02040D04
 	lsl r0, r5, #0x10
 	lsr r0, r0, #0x10
 	mov r1, #0x20
-	bl FUN_020852E8
+	bl GetNutName
 	add r5, r0, #0x0
 	cmp r4, #0x2
 	bhs _02040D5A
diff --git a/arm9/asm/unk_020250A4.s b/arm9/asm/unk_020250A4.s
index 8a0f16b8..76e0e8ce 100644
--- a/arm9/asm/unk_020250A4.s
+++ b/arm9/asm/unk_020250A4.s
@@ -78,7 +78,7 @@ FUN_02025128: ; 0x02025128
 	push {r3-r7, lr}
 	sub sp, #0x8
 	add r7, r0, #0x0
-	bl FUN_02085258
+	bl OpenNutsDataNarc
 	str r0, [sp, #0x0]
 	add r0, r7, #0x0
 	mov r1, #0xc0
@@ -90,18 +90,18 @@ _02025142:
 	ldr r0, [sp, #0x0]
 	add r1, r6, #0x0
 	add r2, r7, #0x0
-	bl FUN_02085264
+	bl ReadNutDataFromNarc
 	add r4, r0, #0x0
 	mov r1, #0x3
-	bl FUN_02085290
+	bl GetNutAttr
 	strb r0, [r5, #0x0]
 	add r0, r4, #0x0
 	mov r1, #0x4
-	bl FUN_02085290
+	bl GetNutAttr
 	strb r0, [r5, #0x1]
 	add r0, r4, #0x0
 	mov r1, #0x2
-	bl FUN_02085290
+	bl GetNutAttr
 	strb r0, [r5, #0x2]
 	add r0, r4, #0x0
 	bl FreeToHeap
@@ -110,7 +110,7 @@ _02025142:
 	cmp r6, #0x40
 	blt _02025142
 	ldr r0, [sp, #0x0]
-	bl FUN_0208526C
+	bl CloseNutsDataNarc
 	ldr r0, [sp, #0x4]
 	add sp, #0x8
 	pop {r3-r7, pc}
diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s
index 67728262..15021367 100644
--- a/arm9/asm/unk_02060CCC.s
+++ b/arm9/asm/unk_02060CCC.s
@@ -1535,7 +1535,7 @@ FUN_02061750: ; 0x02061750
 	sub r0, #0x95
 	lsl r0, r0, #0x10
 	lsr r0, r0, #0x10
-	bl FUN_020852E8
+	bl GetNutName
 	add r4, r0, #0x0
 	mov r1, #0x1
 	str r1, [sp, #0x0]
diff --git a/arm9/asm/unk_0206E5B4.s b/arm9/asm/unk_0206E5B4.s
index 5cba23c1..f7c743f6 100644
--- a/arm9/asm/unk_0206E5B4.s
+++ b/arm9/asm/unk_0206E5B4.s
@@ -723,21 +723,21 @@ _0206E72C:
 	ldr r1, _0206E75C ; =UNK_020F85B4
 	lsl r3, r3, #0x3
 	ldrh r1, [r1, r3]
-	mov r0, #0xf
+	mov r0, #0xf ; NARC_ITEMTOOL_ITEMDATA_ITEM_DATA
 	bl AllocAndReadWholeNarcMemberByIdPair
 	pop {r3, pc}
 _0206E73A:
 	ldr r1, _0206E760 ; =UNK_020F85B4 + 2
 	lsl r3, r3, #0x3
 	ldrh r1, [r1, r3]
-	mov r0, #0x10
+	mov r0, #0x10 ; NARC_ITEMTOOL_ITEMDATA_ITEM_ICON
 	bl AllocAndReadWholeNarcMemberByIdPair
 	pop {r3, pc}
 _0206E748:
 	ldr r1, _0206E764 ; =UNK_020F85B4 + 4
 	lsl r3, r3, #0x3
 	ldrh r1, [r1, r3]
-	mov r0, #0x10
+	mov r0, #0x10 ; NARC_ITEMTOOL_ITEMDATA_ITEM_ICON
 	bl AllocAndReadWholeNarcMemberByIdPair
 	pop {r3, pc}
 _0206E756:
@@ -756,7 +756,7 @@ FUN_0206E768: ; 0x0206E768
 	add r5, r0, #0x0
 	add r4, r1, #0x0
 	mov r0, #0x1
-	mov r1, #0x1a
+	mov r1, #0x1a ; NARC_MSGDATA_MSG
 	lsl r2, r2, #0x2
 	bl NewMsgDataFromNarc
 	add r6, r0, #0x0
@@ -776,7 +776,7 @@ FUN_0206E790: ; 0x0206E790
 	add r4, r1, #0x0
 	ldr r2, _0206E7B4 ; =0x00000157
 	mov r0, #0x1
-	mov r1, #0x1a
+	mov r1, #0x1a ; NARC_MSGDATA_MSG
 	bl NewMsgDataFromNarc
 	add r6, r0, #0x0
 	add r1, r4, #0x0
@@ -1376,7 +1376,7 @@ FUN_0206EB50: ; 0x0206EB50
 	mul r1, r0
 	str r1, [sp, #0x0]
 	mov r1, #0x0
-	mov r0, #0xf
+	mov r0, #0xf ; NARC_ITEMTOOL_ITEMDATA_ITEM_DATA
 	add r2, r4, #0x0
 	add r3, r1, #0x0
 	bl AllocAndReadFromNarcMemberByIdPair
diff --git a/arm9/asm/unk_02085258.s b/arm9/asm/unk_02085258.s
deleted file mode 100644
index ba69aea4..00000000
--- a/arm9/asm/unk_02085258.s
+++ /dev/null
@@ -1,146 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_02085258
-FUN_02085258: ; 0x02085258
-	ldr r3, _02085260 ; =NARC_ctor
-	add r1, r0, #0x0
-	mov r0, #0x44
-	bx r3
-	.balign 4
-_02085260: .word NARC_ctor
-
-	thumb_func_start FUN_02085264
-FUN_02085264: ; 0x02085264
-	ldr r3, _02085268 ; =NARC_AllocAndReadWholeMember
-	bx r3
-	.balign 4
-_02085268: .word NARC_AllocAndReadWholeMember
-
-	thumb_func_start FUN_0208526C
-FUN_0208526C: ; 0x0208526C
-	ldr r3, _02085270 ; =NARC_dtor
-	bx r3
-	.balign 4
-_02085270: .word NARC_dtor
-
-	thumb_func_start FUN_02085274
-FUN_02085274: ; 0x02085274
-	add r3, r0, #0x0
-	add r2, r1, #0x0
-	add r1, r3, #0x0
-	ldr r3, _02085280 ; =AllocAndReadWholeNarcMemberByIdPair
-	mov r0, #0x44
-	bx r3
-	.balign 4
-_02085280: .word AllocAndReadWholeNarcMemberByIdPair
-
-	thumb_func_start FUN_02085284
-FUN_02085284: ; 0x02085284
-	ldr r3, _0208528C ; =FUN_02085274
-	sub r0, #0x95
-	bx r3
-	nop
-_0208528C: .word FUN_02085274
-
-	thumb_func_start FUN_02085290
-FUN_02085290: ; 0x02085290
-	cmp r1, #0xa
-	bhi _020852E2
-	add r1, r1, r1
-	add r1, pc
-	ldrh r1, [r1, #0x6]
-	lsl r1, r1, #0x10
-	asr r1, r1, #0x10
-	add pc, r1
-_020852A0: ; jump table (using 16-bit offset)
-	.short _020852B6 - _020852A0 - 2; case 0
-	.short _020852BA - _020852A0 - 2; case 1
-	.short _020852BE - _020852A0 - 2; case 2
-	.short _020852C2 - _020852A0 - 2; case 3
-	.short _020852C6 - _020852A0 - 2; case 4
-	.short _020852CA - _020852A0 - 2; case 5
-	.short _020852CE - _020852A0 - 2; case 6
-	.short _020852D2 - _020852A0 - 2; case 7
-	.short _020852D6 - _020852A0 - 2; case 8
-	.short _020852DA - _020852A0 - 2; case 9
-	.short _020852DE - _020852A0 - 2; case 10
-_020852B6:
-	ldrh r0, [r0, #0x0]
-	bx lr
-_020852BA:
-	ldrb r0, [r0, #0x2]
-	bx lr
-_020852BE:
-	ldrb r0, [r0, #0x3]
-	bx lr
-_020852C2:
-	ldrb r0, [r0, #0x4]
-	bx lr
-_020852C6:
-	ldrb r0, [r0, #0x5]
-	bx lr
-_020852CA:
-	ldrb r0, [r0, #0x6]
-	bx lr
-_020852CE:
-	ldrb r0, [r0, #0x7]
-	bx lr
-_020852D2:
-	ldrb r0, [r0, #0x8]
-	bx lr
-_020852D6:
-	ldrb r0, [r0, #0x9]
-	bx lr
-_020852DA:
-	ldrb r0, [r0, #0xa]
-	bx lr
-_020852DE:
-	ldrb r0, [r0, #0xb]
-	bx lr
-_020852E2:
-	mov r0, #0x0
-	bx lr
-	.balign 4
-
-	thumb_func_start FUN_020852E8
-FUN_020852E8: ; 0x020852E8
-	push {r3-r5, lr}
-	ldr r2, _0208530C ; =0x00000175
-	add r4, r0, #0x0
-	add r3, r1, #0x0
-	mov r0, #0x1
-	mov r1, #0x1a
-	bl NewMsgDataFromNarc
-	add r5, r0, #0x0
-	add r1, r4, #0x0
-	bl FUN_0200A914
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl DestroyMsgData
-	add r0, r4, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-_0208530C: .word 0x00000175
-
-	thumb_func_start FUN_02085310
-FUN_02085310: ; 0x02085310
-	push {r3-r5, lr}
-	mov r2, #0x5d
-	add r4, r0, #0x0
-	add r3, r1, #0x0
-	mov r0, #0x1
-	mov r1, #0x1a
-	lsl r2, r2, #0x2
-	bl NewMsgDataFromNarc
-	add r5, r0, #0x0
-	add r1, r4, #0x0
-	bl FUN_0200A914
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl DestroyMsgData
-	add r0, r4, #0x0
-	pop {r3-r5, pc}
-	.balign 4
diff --git a/arm9/global.inc b/arm9/global.inc
index 810a8074..91b0ca46 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -5282,14 +5282,14 @@
 .extern FUN_020851F8
 .extern FUN_02085224
 .extern FUN_0208524C
-.extern FUN_02085258
-.extern FUN_02085264
-.extern FUN_0208526C
-.extern FUN_02085274
-.extern FUN_02085284
-.extern FUN_02085290
-.extern FUN_020852E8
-.extern FUN_02085310
+.extern OpenNutsDataNarc
+.extern ReadNutDataFromNarc
+.extern CloseNutsDataNarc
+.extern LoadNutDataSingle
+.extern LoadNutDataSingleByItemId
+.extern GetNutAttr
+.extern GetNutName
+.extern GetNutDesc
 .extern FUN_02085338
 .extern FUN_020853A8
 .extern FUN_020853B0
diff --git a/arm9/lib/include/OS_alarm.h b/arm9/lib/include/OS_alarm.h
index a9734d1b..ebdf01ba 100644
--- a/arm9/lib/include/OS_alarm.h
+++ b/arm9/lib/include/OS_alarm.h
@@ -1,28 +1,13 @@
-#ifndef POKEDIAMOND_OS_ALARM_H
-#define POKEDIAMOND_OS_ALARM_H
+#ifndef POKEDIAMOND_ARM9_OS_ALARM_H
+#define POKEDIAMOND_ARM9_OS_ALARM_H
 
 #include "nitro/types.h"
 #include "OS_thread.h"
 #include "OS_tick.h"
-
-typedef void (*OSAlarmHandler) (void *);
-
-struct OSiAlarm
-{
-    OSAlarmHandler handler;
-    void *arg;
-
-    u32 tag;
-    OSTick fire;
-    OSAlarm *prev;
-    OSAlarm *next;
-
-    OSTick period;
-    OSTick start;
-};
+#include "nitro/OS_alarm_shared.h"
 
 void OS_CancelAlarm(OSAlarm *alarm);
 void OS_CreateAlarm(OSAlarm *alarm);
 void OS_SetAlarm(OSAlarm *alarm, OSTick tick, OSAlarmHandler handler, void *arg);
 
-#endif //POKEDIAMOND_OS_ALARM_H
+#endif //POKEDIAMOND_ARM9_OS_ALARM_H
diff --git a/arm9/lib/include/OS_mutex.h b/arm9/lib/include/OS_mutex.h
index 0fc261a4..9da89c69 100644
--- a/arm9/lib/include/OS_mutex.h
+++ b/arm9/lib/include/OS_mutex.h
@@ -1,16 +1,10 @@
-#ifndef POKEDIAMOND_OS_MUTEX_H
-#define POKEDIAMOND_OS_MUTEX_H
+#ifndef POKEDIAMOND_ARM9_OS_MUTEX_H
+#define POKEDIAMOND_ARM9_OS_MUTEX_H
 
-#include "nitro/types.h"
 #include "OS_thread.h"
-
-struct OSMutex {
-    OSThreadQueue queue;
-    OSThread *thread;
-    s32 count;
-    OSMutexLink link;
-};
+#include "OS_context.h"
+#include "nitro/OS_mutex_shared.h"
 
 void OSi_UnlockAllMutex(OSThread * thread);
 
-#endif //POKEDIAMOND_OS_MUTEX_H
+#endif //POKEDIAMOND_ARM9_OS_MUTEX_H
diff --git a/arm9/lib/include/OS_tick.h b/arm9/lib/include/OS_tick.h
index 3dba9818..59c43b10 100644
--- a/arm9/lib/include/OS_tick.h
+++ b/arm9/lib/include/OS_tick.h
@@ -1,14 +1,9 @@
-#ifndef POKEDIAMOND_OS_TICK_H
-#define POKEDIAMOND_OS_TICK_H
+#ifndef POKEDIAMOND_ARM9_OS_TICK_H
+#define POKEDIAMOND_ARM9_OS_TICK_H
 
 #include "consts.h"
 #include "OS_timer.h"
-
-typedef u64 OSTick;
-
-#define OS_SYSTEM_CLOCK HW_SYSTEM_CLOCK
-
-#define OS_MilliSecondsToTicks(msec) ((OSTick)(((OS_SYSTEM_CLOCK/1000) * (u64)(msec)) / 64))
+#include "nitro/OS_tick_shared.h"
 
 #define OSi_TICK_TIMERCONTROL        (REG_OS_TM0CNT_H_E_MASK | REG_OS_TM0CNT_H_I_MASK | OS_TIMER_PRESCALER_64)
 
@@ -18,4 +13,4 @@ static void OSi_CountUpTick(void);
 OSTick OS_GetTick(void);
 u16 OS_GetTickLo(void);
 
-#endif //POKEDIAMOND_OS_TICK_H
+#endif //POKEDIAMOND_ARM9_OS_TICK_H
diff --git a/arm9/lib/include/consts.h b/arm9/lib/include/consts.h
index a24e9d89..5dd0b150 100644
--- a/arm9/lib/include/consts.h
+++ b/arm9/lib/include/consts.h
@@ -4,6 +4,7 @@
 #include "nitro/consts_shared.h"
 #include "mmap.h"
 #include "registers.h"
+#include "systemWork.h"
 
 #define HW_C6_PR_4KB               0x16
 #define HW_C6_PR_8KB               0x18
@@ -27,8 +28,6 @@
 #define HW_C6_PR_2GB               0x3c
 #define HW_C6_PR_4GB               0x3e
 
-#define HW_SYSTEM_CLOCK            33514000
-
 #define PXI_PROC_ARM7              0x01
 
 #define OSi_CONSOLE_NOT_DETECT     0xffffffff
@@ -38,12 +37,6 @@
 #define OS_CONSOLE_SIZE_MASK       0x00000003
 #define OS_CONSOLE_SIZE_4MB        0x00000001
 
-#define OS_THREAD_LAUNCHER_PRIORITY 0x10
-#define OS_THREAD_PRIORITY_MIN     0x00
-#define OS_THREAD_PRIORITY_MAX     0x1F
-
-#define OS_THREAD_SPECIFIC_MAX     0x03
-
 #define OSi_TCM_REGION_BASE_MASK   0xfffff000
 
 #define OS_IE_V_BLANK       (1UL << 0)
diff --git a/arm9/lib/include/mmap.h b/arm9/lib/include/mmap.h
index 5967695c..12823fa0 100644
--- a/arm9/lib/include/mmap.h
+++ b/arm9/lib/include/mmap.h
@@ -14,8 +14,6 @@ extern u32 SDK_AUTOLOAD_DTCM_START[];
 #define HW_ITCM_SIZE            0x00008000
 #define HW_ITCM_END (HW_ITCM + HW_ITCM_SIZE)
 
-#define HW_WRAM                 0x037F8000
-
 #define HW_DTCM                 ((u32)SDK_AUTOLOAD_DTCM_START)
 #define HW_DTCM_SIZE            0x00004000
 
@@ -29,7 +27,6 @@ extern u32 SDK_AUTOLOAD_DTCM_START[];
 #define HW_ROM_BASE_OFFSET_BUF  (HW_MAIN_MEM + 0x007ffc2c)
 #define HW_ROM_HEADER_BUF       (HW_MAIN_MEM + 0x007ffe00)      // ROM registration area data buffer
 #define HW_RED_RESERVED         (HW_MAIN_MEM + 0x007ff800)      // Some kind of reserved data for shared memory
-#define HW_MAIN_MEM_SYSTEM      (HW_MAIN_MEM + 0x007ffc00)
 #define HW_MAIN_MEM_EX_END      (HW_MAIN_MEM + HW_MAIN_MEM_EX_SIZE)
 #define HW_MAIN_MEM_SHARED      (HW_MAIN_MEM_EX_END - HW_MAIN_MEM_SHARED_SIZE)
 #define HW_DTCM_SVC_STACK_END   (HW_DTCM + 0x00003fc0)
@@ -60,52 +57,4 @@ extern u32 SDK_AUTOLOAD_DTCM_START[];
 #define OSi_WRAM_MAIN_ARENA_HI_DEFAULT  (HW_WRAM)
 #define OSi_WRAM_MAIN_ARENA_LO_DEFAULT  (HW_WRAM)
 
-#include "OS_thread.h" //not ideal but it's necessary
-#include "OS_spinLock.h"
-
-typedef struct {
-    u8      bootCheckInfo[0x20];       // 000-01f:   32byte boot check info
-    u32     resetParameter;            // 020-023:    4byte reset parameter
-    u8      padding5[0x8];             // 024-02c:  (8byte)
-    u32     romBaseOffset;             // 02c-02f:    4byte ROM offset of own program
-    u8      cartridgeModuleInfo[12];   // 030-03b:   12byte cartridge module info
-    u32     vblankCount;               // 03c-03f:    4byte V-Blank Count
-    u8      wmBootBuf[0x40];           // 040-07f:   64byte WM multiboot buffer
-    u8      nvramUserInfo[0x100];      // 080-17f: 256bytes NVRAM user info
-    u8      isd_reserved1[0x20];       // 180-19f:  32bytes ISDebugger reserved
-    u8      arenaInfo[0x48];           // 1a0-1e7:  72byte Arena information
-    u8      real_time_clock[8];        // 1e8-1ef:   8bytes RTC
-    u32     dmaClearBuf[4];            // 1f0-1ff:  16bytes DMA clear information buffer (for ARM9-TEG)
-    u8      rom_header[0x160];         // 200-35f: 352bytes ROM registration area info storage buffer
-    u8      isd_reserved2[32];         // 360-37f:  32bytes ISDebugger reserved
-    u32     pxiSignalParam[2];         // 380-387:   8bytes Param for PXI Signal
-    u32     pxiHandleChecker[2];       // 388-38f:   8bytes Flag  for PXI Command Handler Installed
-    u32     mic_last_address;          // 390-393:   4bytes MIC latest sampling result storage address
-    u16     mic_sampling_data;         // 394-395:   2bytes MIC sampling result
-    u16     wm_callback_control;       // 396-397:   2bytes Parameter for WM callback synchronization
-    u16     wm_rssi_pool;              // 398-399:   2bytes Random number source depends on WM received signal intensity
-    u8      padding3[2];               // 39a-39b: (2bytes)
-    u32     component_param;           // 39c-39f:   4bytes Parameter for Component synchronization
-    OSThreadInfo *threadinfo_mainp;    // 3a0-3a3:   4bytes Verify that the pointer to ARM9 thread information is initial value 0
-    OSThreadInfo *threadinfo_subp;     // 3a4-3a7:   4bytes Verify that the pointer to ARM7 thread information is initial value 0
-    u16     button_XY;                 // 3a8-3a9:   2bytes XY button information storage location
-    u8      touch_panel[4];            // 3aa-3ad:   4bytes Touch Screen information storage location
-    u16     autoloadSync;              // 3ae-3af:   2bytes autoload sync between processors
-    u32     lockIDFlag_mainp[2];       // 3b0-3b7:   8bytes lockID management flag (ARM9)
-    u32     lockIDFlag_subp[2];        // 3b8-3bf:   8bytes lockID management flag (ARM7)
-    struct OSLockWord lock_VRAM_C;     // 3c0-3c7:   8bytes           C - lock buffer
-    struct OSLockWord lock_VRAM_D;     // 3c8-3cf:   8bytes VRAM-D - lock buffer
-    struct OSLockWord lock_WRAM_BLOCK0; // 3d0-3d7:   8bytes   Block0 - lock buffer
-    struct OSLockWord lock_WRAM_BLOCK1; // 3d8-3df:   8bytes CPU internal work RAM - Block1 - lock buffer
-    struct OSLockWord lock_CARD;       // 3e0-3e7:   8bytes Game Card - lock buffer
-    struct OSLockWord lock_CARTRIDGE;  // 3e8-3ef:   8bytes DS Pak - lock buffer
-    struct OSLockWord lock_INIT;       // 3f0-3f7:   8bytes Initialization lock buffer
-    u16     mmem_checker_mainp;        // 3f8-3f9:   2bytes MainMomory Size Checker for Main processor
-    u16     mmem_checker_subp;         // 3fa-3fb:   2bytes MainMomory Size Checker for Sub processor
-    u8      padding4[2];               // 3fc-3fd: (2bytes)
-    u16     command_area;              // 3fe-3ff:   2bytes Command Area
-} OSSystemWork; //0x027FFC00
-
-#define OS_GetSystemWork()      ((OSSystemWork *)HW_MAIN_MEM_SYSTEM)
-
 #endif //POKEDIAMOND_ARM9_MMAP_H
\ No newline at end of file
diff --git a/arm9/lib/include/systemWork.h b/arm9/lib/include/systemWork.h
new file mode 100644
index 00000000..b7660985
--- /dev/null
+++ b/arm9/lib/include/systemWork.h
@@ -0,0 +1,7 @@
+#ifndef POKEDIAMOND_ARM9_SYSTEMWORK_H
+#define POKEDIAMOND_ARM9_SYSTEMWORK_H
+
+#include "OS_context.h"
+#include "nitro/OS_systemWork_shared.h"
+
+#endif //POKEDIAMOND_ARM9_SYSTEMWORK_H
diff --git a/arm9/lib/src/OS_reset.c b/arm9/lib/src/OS_reset.c
index f22b0e3c..95238f46 100644
--- a/arm9/lib/src/OS_reset.c
+++ b/arm9/lib/src/OS_reset.c
@@ -4,6 +4,7 @@
 #include "OS_terminate_proc.h"
 #include "OS_interrupt.h"
 #include "OS_system.h"
+#include "OS_spinLock.h"
 #include "sections.h"
 
 static u16 OSi_IsInitReset = 0;
diff --git a/arm9/lib/syscall/_svc_mw.s b/arm9/lib/syscall/_svc_mw.s
index c1e36b4b..d449ee58 100644
--- a/arm9/lib/syscall/_svc_mw.s
+++ b/arm9/lib/syscall/_svc_mw.s
@@ -7,115 +7,115 @@
 	; Secure area
 	.space 0x800
 
-	non_word_aligned_thumb_func_start SVC_SoftReset
+	.global SVC_SoftReset
+	.thumb
 SVC_SoftReset:
 	swi 0
 	bx lr
-	thumb_func_end SVC_SoftReset
 
-	non_word_aligned_thumb_func_start SVC_WaitByLoop
+	.global SVC_WaitByLoop
+	.thumb
 SVC_WaitByLoop:
 	swi 3
 	bx lr
-	thumb_func_end SVC_WaitByLoop
 
-	non_word_aligned_thumb_func_start SVC_WaitIntr
+	.global SVC_WaitIntr
+	.thumb
 SVC_WaitIntr:
 	mov r2, #0
 	swi 4
 	bx lr
-	thumb_func_end SVC_WaitIntr
 
-	non_word_aligned_thumb_func_start SVC_WaitVBlankIntr
+	.global SVC_WaitVBlankIntr
+	.thumb
 SVC_WaitVBlankIntr:
 	mov r2, #0
 	swi 5
 	bx lr
-	thumb_func_end SVC_WaitVBlankIntr
 
-	non_word_aligned_thumb_func_start SVC_Halt
+	.global SVC_Halt
+	.thumb
 SVC_Halt:
 	swi 6
 	bx lr
-	thumb_func_end SVC_Halt
 
-	non_word_aligned_thumb_func_start SVC_Div
+	.global SVC_Div
+	.thumb
 SVC_Div:
 	swi 9
 	bx lr
-	thumb_func_end SVC_Div
 
-	non_word_aligned_thumb_func_start SVC_DimRem
+	.global SVC_DivRem
+	.thumb
 SVC_DivRem:
 	swi 9
 	add r0, r1, #0
 	bx lr
-	thumb_func_end SVC_DivRem
 
-	non_word_aligned_thumb_func_start SVC_CpuSet
+	.global SVC_CpuSet
+	.thumb
 SVC_CpuSet:
 	swi 11
 	bx lr
-	thumb_func_end SVC_CpuSet
 
-	non_word_aligned_thumb_func_start SVC_CpuFastSet
-SVC_CpuFastSet:
+	.global SVC_CpuSetFast
+	.thumb
+SVC_CpuSetFast:
 	swi 12
 	bx lr
-	thumb_func_end SVC_CpuFastSet
 
-	non_word_aligned_thumb_func_start SVC_Sqrt
+	.global SVC_Sqrt
+	.thumb
 SVC_Sqrt:
 	swi 13
 	bx lr
-	thumb_func_end SVC_Sqrt
 
-	non_word_aligned_thumb_func_start SVC_GetCRC16
+	.global SVC_GetCRC16
+	.thumb
 SVC_GetCRC16:
 	swi 14
 	bx lr
-	thumb_func_end SVC_GetCRC16
 
-	non_word_aligned_thumb_func_start IsMemExpanded
-IsMemExpanded:
+	.global IsMmemExpanded
+	.thumb
+IsMmemExpanded:
 	swi 15
 	bx lr
-	thumb_func_end IsMemExpanded
 
-	non_word_aligned_thumb_func_start SVC_UnpackBits
+	.global SVC_UnpackBits
+	.thumb
 SVC_UnpackBits:
 	swi 16
 	bx lr
-	thumb_func_end SVC_UnpackBits
 
-	non_word_aligned_thumb_func_start SVC_UncompressLZ8
+	.global SVC_UncompressLZ8
+	.thumb
 SVC_UncompressLZ8:
 	swi 17
 	bx lr
-	thumb_func_end SVC_UncompressLZ8
 
-	non_word_aligned_thumb_func_start SVC_UncompressLZ16FromDevice
+	.global SVC_UncompressLZ16FromDevice
+	.thumb
 SVC_UncompressLZ16FromDevice:
 	swi 18
 	bx lr
-	thumb_func_end SVC_UncompressLZ16FromDevice
 
-	non_word_aligned_thumb_func_start SVC_UncompressHuffmanFromDevice
+	.global SVC_UncompressHuffmanFromDevice
+	.thumb
 SVC_UncompressHuffmanFromDevice:
 	swi 19
 	bx lr
-	thumb_func_end SVC_UncompressHuffmanFromDevice
 
-	non_word_aligned_thumb_func_start SVC_UncompressRL8
+	.global SVC_UncompressRL8
+	.thumb
 SVC_UncompressRL8:
 	swi 20
 	bx lr
-	thumb_func_end SVC_UncompressRL8
 
-	non_word_aligned_thumb_func_start SVC_UncompressRL16FromDevice
+	.global SVC_UncompressRL16FromDevice
+	.thumb
 SVC_UncompressRL16FromDevice:
 	swi 21
 	bx lr
-	thumb_func_end SVC_UncompressRL16FromDevice
 
 	.balign 4, 0 ; Don't pad with nop
diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s
index 08507c53..fb926299 100644
--- a/arm9/modules/68/asm/module_68.s
+++ b/arm9/modules/68/asm/module_68.s
@@ -56,7 +56,7 @@ MOD68_021D74E0: ; 0x021D74E0
 	ldr r0, [r5, r0]
 	mov r1, #0x24
 	ldrb r0, [r0, #8]
-	bl FUN_02085274
+	bl LoadNutDataSingle
 	mov r1, #0x7f
 	lsl r1, r1, #2
 	str r0, [r5, r1]
@@ -720,7 +720,7 @@ MOD68_021D7A18: ; 0x021D7A18
 	ldr r0, [r5, r0]
 	mov r1, #0x24
 	ldrb r0, [r0, #8]
-	bl FUN_020852E8
+	bl GetNutName
 	add r5, r0, #0
 	mov r1, #0
 	str r1, [sp]
@@ -758,7 +758,7 @@ MOD68_021D7AE4: ; 0x021D7AE4
 	ldr r0, [r4, r0]
 	mov r1, #0x24
 	ldrb r0, [r0, #8]
-	bl FUN_02085310
+	bl GetNutDesc
 	mov r1, #0
 	add r4, r0, #0
 	str r1, [sp]
@@ -831,7 +831,7 @@ MOD68_021D7B80: ; 0x021D7B80
 	lsl r0, r0, #2
 	ldr r0, [r4, r0]
 	mov r1, #1
-	bl FUN_02085290
+	bl GetNutAttr
 	add r1, r0, #0
 	beq _021D7BA4
 	sub r1, r1, #1
@@ -912,7 +912,7 @@ MOD68_021D7C28: ; 0x021D7C28
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	mov r1, #0
-	bl FUN_02085290
+	bl GetNutAttr
 	mov r1, #0xfa
 	lsl r1, r1, #2
 	mul r1, r0
@@ -1381,7 +1381,7 @@ MOD68_021D7F98: ; 0x021D7F98
 	ldr r0, [r4, r0]
 	mov r1, #0x24
 	ldrb r0, [r0, #8]
-	bl FUN_02085274
+	bl LoadNutDataSingle
 	mov r1, #0x7f
 	lsl r1, r1, #2
 	str r0, [r4, r1]
@@ -2159,7 +2159,7 @@ MOD68_021D85F4: ; 0x021D85F4
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	mov r1, #5
-	bl FUN_02085290
+	bl GetNutAttr
 	add r2, r0, #0
 	mov r1, #0x65
 	lsl r1, r1, #2
@@ -2172,7 +2172,7 @@ MOD68_021D85F4: ; 0x021D85F4
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	mov r1, #6
-	bl FUN_02085290
+	bl GetNutAttr
 	add r2, r0, #0
 	ldr r1, _021D8860 ; =0x0000019A
 	lsl r2, r2, #0x18
@@ -2184,7 +2184,7 @@ MOD68_021D85F4: ; 0x021D85F4
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	mov r1, #7
-	bl FUN_02085290
+	bl GetNutAttr
 	add r2, r0, #0
 	ldr r1, _021D8868 ; =0x000001A6
 	lsl r2, r2, #0x18
@@ -2202,7 +2202,7 @@ MOD68_021D85F4: ; 0x021D85F4
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	mov r1, #9
-	bl FUN_02085290
+	bl GetNutAttr
 	add r2, r0, #0
 	mov r1, #0x6b
 	lsl r1, r1, #2
@@ -2215,7 +2215,7 @@ MOD68_021D85F4: ; 0x021D85F4
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	mov r1, #5
-	bl FUN_02085290
+	bl GetNutAttr
 	add r2, r0, #0
 	ldr r1, _021D8878 ; =0x000001B2
 	lsl r2, r2, #0x18
@@ -2232,7 +2232,7 @@ MOD68_021D85F4: ; 0x021D85F4
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	mov r1, #8
-	bl FUN_02085290
+	bl GetNutAttr
 	add r2, r0, #0
 	mov r1, #0x6e
 	lsl r1, r1, #2
@@ -2245,7 +2245,7 @@ MOD68_021D85F4: ; 0x021D85F4
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	mov r1, #9
-	bl FUN_02085290
+	bl GetNutAttr
 	add r2, r0, #0
 	mov r1, #0x71
 	lsl r1, r1, #2
@@ -2263,7 +2263,7 @@ MOD68_021D85F4: ; 0x021D85F4
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	mov r1, #7
-	bl FUN_02085290
+	bl GetNutAttr
 	add r2, r0, #0
 	ldr r1, _021D8898 ; =0x000001D6
 	lsl r2, r2, #0x18
@@ -2275,7 +2275,7 @@ MOD68_021D85F4: ; 0x021D85F4
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	mov r1, #8
-	bl FUN_02085290
+	bl GetNutAttr
 	add r2, r0, #0
 	mov r1, #0x1d
 	lsl r1, r1, #4
@@ -2294,7 +2294,7 @@ MOD68_021D85F4: ; 0x021D85F4
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	mov r1, #6
-	bl FUN_02085290
+	bl GetNutAttr
 	add r2, r0, #0
 	ldr r1, _021D88A8 ; =0x000001E2
 	lsl r2, r2, #0x18
@@ -2306,7 +2306,7 @@ MOD68_021D85F4: ; 0x021D85F4
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	mov r1, #7
-	bl FUN_02085290
+	bl GetNutAttr
 	add r2, r0, #0
 	ldr r1, _021D88B0 ; =0x000001EE
 	lsl r2, r2, #0x18
@@ -2318,7 +2318,7 @@ MOD68_021D85F4: ; 0x021D85F4
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	mov r1, #8
-	bl FUN_02085290
+	bl GetNutAttr
 	add r2, r0, #0
 	mov r1, #0x7a
 	lsl r1, r1, #2
diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s
index 2ea96e13..030457b3 100644
--- a/arm9/modules/73/asm/module_73.s
+++ b/arm9/modules/73/asm/module_73.s
@@ -9161,7 +9161,7 @@ _021DBA56:
 	lsl r4, r0, #2
 	ldr r0, [sp, #0x24]
 	ldr r0, [r0, r4]
-	bl FUN_02085284
+	bl LoadNutDataSingleByItemId
 	mov r3, #0
 	add r7, r0, #0
 	add r2, r3, #0
@@ -9196,7 +9196,7 @@ _021DBAA0:
 _021DBAA4:
 	add r0, r7, #0
 	add r1, r5, #5
-	bl FUN_02085290
+	bl GetNutAttr
 	ldr r1, [r4]
 	add r5, r5, #1
 	add r0, r1, r0
@@ -9205,7 +9205,7 @@ _021DBAA4:
 	blt _021DBAA4
 	add r0, r7, #0
 	mov r1, #0xa
-	bl FUN_02085290
+	bl GetNutAttr
 	ldr r1, [sp, #0x20]
 	add r0, r1, r0
 	str r0, [sp, #0x20]
diff --git a/arm9/src/nutdata.c b/arm9/src/nutdata.c
new file mode 100644
index 00000000..09542052
--- /dev/null
+++ b/arm9/src/nutdata.c
@@ -0,0 +1,78 @@
+#include "global.h"
+#include "filesystem.h"
+#include "itemtool.h"
+#include "msg_data.h"
+
+#pragma thumb on
+
+NARC * OpenNutsDataNarc(u32 heap_id)
+{
+    return NARC_ctor(NARC_ITEMTOOL_ITEMDATA_NUTS_DATA, heap_id);
+}
+
+struct NutData * ReadNutDataFromNarc(NARC * narc, u32 berry_idx, u32 heap_id)
+{
+    return NARC_AllocAndReadWholeMember(narc, berry_idx, heap_id);
+}
+
+void CloseNutsDataNarc(NARC * narc)
+{
+    NARC_dtor(narc);
+}
+
+struct NutData * LoadNutDataSingle(u32 berry_idx, u32 heap_id)
+{
+    return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_NUTS_DATA, berry_idx, heap_id);
+}
+
+struct NutData * LoadNutDataSingleByItemId(u32 item_id, u32 heap_id)
+{
+    return LoadNutDataSingle(item_id - FIRST_BERRY_IDX, heap_id);
+}
+
+u32 GetNutAttr(struct NutData * nut, u32 attr)
+{
+    switch (attr)
+    {
+    case 0:
+        return nut->unk0;
+    case 1:
+        return nut->unk2;
+    case 2:
+        return nut->unk3;
+    case 3:
+        return nut->unk4;
+    case 4:
+        return nut->unk5;
+    case 5:
+        return nut->unk6;
+    case 6:
+        return nut->unk7;
+    case 7:
+        return nut->unk8;
+    case 8:
+        return nut->unk9;
+    case 9:
+        return nut->unkA;
+    case 10:
+        return nut->unkB;
+    default:
+        return 0;
+    }
+}
+
+u16 * GetNutName(u32 berry_idx, u32 heap_id)
+{
+    struct MsgData * msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 373, heap_id);
+    u16 * ret = FUN_0200A914(msgData, berry_idx);
+    DestroyMsgData(msgData);
+    return ret;
+}
+
+u16 * GetNutDesc(u32 berry_idx, u32 heap_id)
+{
+    struct MsgData * msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 372, heap_id);
+    u16 * ret = FUN_0200A914(msgData, berry_idx);
+    DestroyMsgData(msgData);
+    return ret;
+}
diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c
index 9bd9764d..8df597a6 100644
--- a/arm9/src/pokemon.c
+++ b/arm9/src/pokemon.c
@@ -2859,7 +2859,7 @@ void FUN_02069718(struct BoxPokemon * boxmon, u16 move)
     }
 
     moves[3] = move;
-    pp[3] = (u8)GetWazaAttr(move, 5);
+    pp[3] = (u8)GetWazaAttr(move, MOVEATTR_PP);
     ppUp[3] = 0;
 
     for (i = 0; i < 4; i++)
diff --git a/arm9/src/waza.c b/arm9/src/waza.c
index 4b505482..f394fedd 100644
--- a/arm9/src/waza.c
+++ b/arm9/src/waza.c
@@ -15,7 +15,7 @@ void LoadAllWazaTbl(struct WazaTbl * dest)
     ReadFromNarcMemberByIdPair(dest, NARC_POKETOOL_WAZA_WAZA_TBL, 0, 0, (NUM_MOVES + 1) * sizeof(struct WazaTbl));
 }
 
-u32 GetWazaAttr(u16 waza, u32 attr)
+u32 GetWazaAttr(u16 waza, MoveAttr attr)
 {
     struct WazaTbl wazaTbl;
     LoadWazaEntry(waza, &wazaTbl);
@@ -27,38 +27,40 @@ u8 WazaGetMaxPp(u16 waza, u8 ppUp)
     u8 pp;
     if (ppUp > 3)
         ppUp = 3;
-    pp = (u8)GetWazaAttr(waza, 5);
+    pp = (u8)GetWazaAttr(waza, MOVEATTR_PP);
     return (u8)(pp + (pp * 20 * ppUp) / 100);
 }
 
-u32 GetAttrFromWazaTbl(struct WazaTbl * wazaTbl, u32 attr)
+u32 GetAttrFromWazaTbl(struct WazaTbl * wazaTbl, MoveAttr attr)
 {
     switch (attr)
     {
-    case 0:
-        return wazaTbl->unk0;
-    case 1:
+    case MOVEATTR_EFFECT:
+        return wazaTbl->effect;
+    case MOVEATTR_UNK1:
         return wazaTbl->unk2;
-    case 2:
-        return wazaTbl->unk3;
-    case 3:
-        return wazaTbl->unk4;
-    case 4:
-        return wazaTbl->unk5;
-    case 5:
+    case MOVEATTR_POWER:
+        return wazaTbl->power;
+    case MOVEATTR_TYPE:
+        return wazaTbl->type;
+    case MOVEATTR_ACCURACY:
+        return wazaTbl->accuracy;
+    case MOVEATTR_PP:
         return wazaTbl->pp;
-    case 6:
-        return wazaTbl->unk7;
-    case 7:
+    case MOVEATTR_EFFECT_CHANCE:
+        return wazaTbl->effectChance;
+    case MOVEATTR_UNK7:
         return wazaTbl->unk8;
-    case 8:
-        return wazaTbl->unkA;
-    case 9:
+    case MOVEATTR_PRIORTY:
+        return wazaTbl->priority;
+    case MOVEATTR_UNK9:
         return wazaTbl->unkB;
-    case 10:
+    case MOVEATTR_UNK10:
         return wazaTbl->unkC;
-    case 11:
-        return wazaTbl->unkD;
+    case MOVEATTR_CONTEST_TYPE:
+        return wazaTbl->contestType;
+    default:
+        return (u32)wazaTbl;
     }
 }
 
diff --git a/explode_incbins.py b/explode_incbins.py
deleted file mode 100644
index 4e1af1b5..00000000
--- a/explode_incbins.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import sys
-import re
-
-with open(sys.argv[1], 'rb') as rom:
-    for fname in sys.argv[2:]:
-        with open(fname, 'r+') as fp:
-            lines = []
-            for line in fp:
-                m = re.search(r'\.incbin "baserom.nds", (0x\w+), (0x\w+)', line)
-                if m is not None:
-                    addr = int(m[1], 16)
-                    size = int(m[2], 16)
-                    rom.seek(addr)
-                    for i in range(0, size, 16):
-                        data = rom.read(min(size - i, 16))
-                        lines.append('\t.byte ' + ', '.join(f'0x{k:02X}' for k in data) + '\n')
-                else:
-                    lines.append(line)
-            fp.seek(0)
-            fp.truncate()
-            fp.write(''.join(lines))
diff --git a/files/poketool/personal/personal.json b/files/poketool/personal/personal.json
index fcf03aab..47a6fa81 100644
--- a/files/poketool/personal/personal.json
+++ b/files/poketool/personal/personal.json
@@ -1,7 +1,7 @@
 {
   "baseStats": [
     {
-      "species": "SPECIES_NONE",
+      "species": "NONE",
       "hp": 0,
       "atk": 0,
       "def": 0,
@@ -24,10 +24,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 0,
+      "genderRatio": 0.0,
       "eggCycles": 0,
       "friendship": 0,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_NONE",
         "EGG_GROUP_NONE"
@@ -43,7 +43,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_BULBASAUR",
+      "species": "BULBASAUR",
       "hp": 45,
       "atk": 49,
       "def": 49,
@@ -66,10 +66,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_GRASS"
@@ -115,7 +115,7 @@
       ]
     },
     {
-      "species": "SPECIES_IVYSAUR",
+      "species": "IVYSAUR",
       "hp": 60,
       "atk": 62,
       "def": 63,
@@ -138,10 +138,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_GRASS"
@@ -187,7 +187,7 @@
       ]
     },
     {
-      "species": "SPECIES_VENUSAUR",
+      "species": "VENUSAUR",
       "hp": 80,
       "atk": 82,
       "def": 83,
@@ -210,10 +210,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_GRASS"
@@ -264,7 +264,7 @@
       ]
     },
     {
-      "species": "SPECIES_CHARMANDER",
+      "species": "CHARMANDER",
       "hp": 39,
       "atk": 52,
       "def": 43,
@@ -287,10 +287,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_DRAGON"
@@ -343,7 +343,7 @@
       ]
     },
     {
-      "species": "SPECIES_CHARMELEON",
+      "species": "CHARMELEON",
       "hp": 58,
       "atk": 64,
       "def": 58,
@@ -366,10 +366,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_DRAGON"
@@ -422,7 +422,7 @@
       ]
     },
     {
-      "species": "SPECIES_CHARIZARD",
+      "species": "CHARIZARD",
       "hp": 78,
       "atk": 84,
       "def": 78,
@@ -445,10 +445,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_DRAGON"
@@ -512,7 +512,7 @@
       ]
     },
     {
-      "species": "SPECIES_SQUIRTLE",
+      "species": "SQUIRTLE",
       "hp": 44,
       "atk": 48,
       "def": 65,
@@ -535,10 +535,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_WATER_1"
@@ -589,7 +589,7 @@
       ]
     },
     {
-      "species": "SPECIES_WARTORTLE",
+      "species": "WARTORTLE",
       "hp": 59,
       "atk": 63,
       "def": 80,
@@ -612,10 +612,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_WATER_1"
@@ -666,7 +666,7 @@
       ]
     },
     {
-      "species": "SPECIES_BLASTOISE",
+      "species": "BLASTOISE",
       "hp": 79,
       "atk": 83,
       "def": 100,
@@ -689,10 +689,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_WATER_1"
@@ -752,7 +752,7 @@
       ]
     },
     {
-      "species": "SPECIES_CATERPIE",
+      "species": "CATERPIE",
       "hp": 45,
       "atk": 30,
       "def": 35,
@@ -775,10 +775,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -794,7 +794,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_METAPOD",
+      "species": "METAPOD",
       "hp": 50,
       "atk": 20,
       "def": 55,
@@ -817,10 +817,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -836,7 +836,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_BUTTERFREE",
+      "species": "BUTTERFREE",
       "hp": 60,
       "atk": 45,
       "def": 50,
@@ -859,10 +859,10 @@
         "ITEM_NONE",
         "ITEM_SILVERPOWDER"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -916,7 +916,7 @@
       ]
     },
     {
-      "species": "SPECIES_WEEDLE",
+      "species": "WEEDLE",
       "hp": 40,
       "atk": 35,
       "def": 30,
@@ -939,10 +939,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -958,7 +958,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_KAKUNA",
+      "species": "KAKUNA",
       "hp": 45,
       "atk": 25,
       "def": 50,
@@ -981,10 +981,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -1000,7 +1000,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_BEEDRILL",
+      "species": "BEEDRILL",
       "hp": 65,
       "atk": 80,
       "def": 40,
@@ -1023,10 +1023,10 @@
         "ITEM_NONE",
         "ITEM_POISON_BARB"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -1081,7 +1081,7 @@
       ]
     },
     {
-      "species": "SPECIES_PIDGEY",
+      "species": "PIDGEY",
       "hp": 40,
       "atk": 45,
       "def": 40,
@@ -1104,10 +1104,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -1151,7 +1151,7 @@
       ]
     },
     {
-      "species": "SPECIES_PIDGEOTTO",
+      "species": "PIDGEOTTO",
       "hp": 63,
       "atk": 60,
       "def": 55,
@@ -1174,10 +1174,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -1221,7 +1221,7 @@
       ]
     },
     {
-      "species": "SPECIES_PIDGEOT",
+      "species": "PIDGEOT",
       "hp": 83,
       "atk": 80,
       "def": 75,
@@ -1244,10 +1244,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -1293,7 +1293,7 @@
       ]
     },
     {
-      "species": "SPECIES_RATTATA",
+      "species": "RATTATA",
       "hp": 30,
       "atk": 56,
       "def": 35,
@@ -1316,10 +1316,10 @@
         "ITEM_NONE",
         "ITEM_CHILAN_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -1372,7 +1372,7 @@
       ]
     },
     {
-      "species": "SPECIES_RATICATE",
+      "species": "RATICATE",
       "hp": 55,
       "atk": 81,
       "def": 60,
@@ -1395,10 +1395,10 @@
         "ITEM_NONE",
         "ITEM_CHILAN_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -1456,7 +1456,7 @@
       ]
     },
     {
-      "species": "SPECIES_SPEAROW",
+      "species": "SPEAROW",
       "hp": 40,
       "atk": 60,
       "def": 30,
@@ -1479,10 +1479,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -1526,7 +1526,7 @@
       ]
     },
     {
-      "species": "SPECIES_FEAROW",
+      "species": "FEAROW",
       "hp": 65,
       "atk": 90,
       "def": 65,
@@ -1549,10 +1549,10 @@
         "ITEM_NONE",
         "ITEM_SHARP_BEAK"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -1598,7 +1598,7 @@
       ]
     },
     {
-      "species": "SPECIES_EKANS",
+      "species": "EKANS",
       "hp": 35,
       "atk": 60,
       "def": 44,
@@ -1621,10 +1621,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_DRAGON"
@@ -1674,7 +1674,7 @@
       ]
     },
     {
-      "species": "SPECIES_ARBOK",
+      "species": "ARBOK",
       "hp": 60,
       "atk": 85,
       "def": 69,
@@ -1697,10 +1697,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_DRAGON"
@@ -1752,7 +1752,7 @@
       ]
     },
     {
-      "species": "SPECIES_PIKACHU",
+      "species": "PIKACHU",
       "hp": 35,
       "atk": 55,
       "def": 30,
@@ -1775,10 +1775,10 @@
         "ITEM_ORAN_BERRY",
         "ITEM_LIGHT_BALL"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 10,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FAIRY"
@@ -1828,7 +1828,7 @@
       ]
     },
     {
-      "species": "SPECIES_RAICHU",
+      "species": "RAICHU",
       "hp": 60,
       "atk": 90,
       "def": 55,
@@ -1851,10 +1851,10 @@
         "ITEM_NONE",
         "ITEM_ORAN_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 10,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FAIRY"
@@ -1908,7 +1908,7 @@
       ]
     },
     {
-      "species": "SPECIES_SANDSHREW",
+      "species": "SANDSHREW",
       "hp": 50,
       "atk": 75,
       "def": 85,
@@ -1931,10 +1931,10 @@
         "ITEM_NONE",
         "ITEM_QUICK_CLAW"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -1990,7 +1990,7 @@
       ]
     },
     {
-      "species": "SPECIES_SANDSLASH",
+      "species": "SANDSLASH",
       "hp": 75,
       "atk": 100,
       "def": 110,
@@ -2013,10 +2013,10 @@
         "ITEM_NONE",
         "ITEM_QUICK_CLAW"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -2076,7 +2076,7 @@
       ]
     },
     {
-      "species": "SPECIES_NIDORAN_F",
+      "species": "NIDORAN_F",
       "hp": 55,
       "atk": 47,
       "def": 52,
@@ -2099,10 +2099,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 254,
+      "genderRatio": 1.0,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_FIELD"
@@ -2154,7 +2154,7 @@
       ]
     },
     {
-      "species": "SPECIES_NIDORINA",
+      "species": "NIDORINA",
       "hp": 70,
       "atk": 62,
       "def": 67,
@@ -2177,10 +2177,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 254,
+      "genderRatio": 1.0,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -2232,7 +2232,7 @@
       ]
     },
     {
-      "species": "SPECIES_NIDOQUEEN",
+      "species": "NIDOQUEEN",
       "hp": 90,
       "atk": 82,
       "def": 87,
@@ -2255,10 +2255,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 254,
+      "genderRatio": 1.0,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -2332,7 +2332,7 @@
       ]
     },
     {
-      "species": "SPECIES_NIDORAN_M",
+      "species": "NIDORAN_M",
       "hp": 46,
       "atk": 57,
       "def": 40,
@@ -2355,10 +2355,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 0,
+      "genderRatio": 0.0,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_FIELD"
@@ -2409,7 +2409,7 @@
       ]
     },
     {
-      "species": "SPECIES_NIDORINO",
+      "species": "NIDORINO",
       "hp": 61,
       "atk": 72,
       "def": 57,
@@ -2432,10 +2432,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 0,
+      "genderRatio": 0.0,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_FIELD"
@@ -2486,7 +2486,7 @@
       ]
     },
     {
-      "species": "SPECIES_NIDOKING",
+      "species": "NIDOKING",
       "hp": 81,
       "atk": 92,
       "def": 77,
@@ -2509,10 +2509,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 0,
+      "genderRatio": 0.0,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_FIELD"
@@ -2585,7 +2585,7 @@
       ]
     },
     {
-      "species": "SPECIES_CLEFAIRY",
+      "species": "CLEFAIRY",
       "hp": 70,
       "atk": 45,
       "def": 48,
@@ -2608,10 +2608,10 @@
         "ITEM_LEPPA_BERRY",
         "ITEM_MOON_STONE"
       ],
-      "genderRatio": 191,
+      "genderRatio": 0.75,
       "eggCycles": 10,
       "friendship": 140,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_FAIRY"
@@ -2679,7 +2679,7 @@
       ]
     },
     {
-      "species": "SPECIES_CLEFABLE",
+      "species": "CLEFABLE",
       "hp": 95,
       "atk": 70,
       "def": 73,
@@ -2702,10 +2702,10 @@
         "ITEM_LEPPA_BERRY",
         "ITEM_MOON_STONE"
       ],
-      "genderRatio": 191,
+      "genderRatio": 0.75,
       "eggCycles": 10,
       "friendship": 140,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_FAIRY"
@@ -2776,7 +2776,7 @@
       ]
     },
     {
-      "species": "SPECIES_VULPIX",
+      "species": "VULPIX",
       "hp": 38,
       "atk": 41,
       "def": 40,
@@ -2799,10 +2799,10 @@
         "ITEM_RAWST_BERRY",
         "ITEM_RAWST_BERRY"
       ],
-      "genderRatio": 191,
+      "genderRatio": 0.75,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -2847,7 +2847,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_NINETALES",
+      "species": "NINETALES",
       "hp": 73,
       "atk": 76,
       "def": 75,
@@ -2870,10 +2870,10 @@
         "ITEM_RAWST_BERRY",
         "ITEM_RAWST_BERRY"
       ],
-      "genderRatio": 191,
+      "genderRatio": 0.75,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -2923,7 +2923,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_JIGGLYPUFF",
+      "species": "JIGGLYPUFF",
       "hp": 115,
       "atk": 45,
       "def": 20,
@@ -2946,10 +2946,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 191,
+      "genderRatio": 0.75,
       "eggCycles": 10,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_FAIRY"
@@ -3015,7 +3015,7 @@
       ]
     },
     {
-      "species": "SPECIES_WIGGLYTUFF",
+      "species": "WIGGLYTUFF",
       "hp": 140,
       "atk": 70,
       "def": 45,
@@ -3038,10 +3038,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 191,
+      "genderRatio": 0.75,
       "eggCycles": 10,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_FAIRY"
@@ -3110,7 +3110,7 @@
       ]
     },
     {
-      "species": "SPECIES_ZUBAT",
+      "species": "ZUBAT",
       "hp": 40,
       "atk": 45,
       "def": 35,
@@ -3133,10 +3133,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -3187,7 +3187,7 @@
       ]
     },
     {
-      "species": "SPECIES_GOLBAT",
+      "species": "GOLBAT",
       "hp": 75,
       "atk": 80,
       "def": 70,
@@ -3210,10 +3210,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -3266,7 +3266,7 @@
       ]
     },
     {
-      "species": "SPECIES_ODDISH",
+      "species": "ODDISH",
       "hp": 45,
       "atk": 50,
       "def": 55,
@@ -3289,10 +3289,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_GRASS",
         "EGG_GROUP_GRASS"
@@ -3336,7 +3336,7 @@
       ]
     },
     {
-      "species": "SPECIES_GLOOM",
+      "species": "GLOOM",
       "hp": 60,
       "atk": 65,
       "def": 70,
@@ -3359,10 +3359,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_GRASS",
         "EGG_GROUP_GRASS"
@@ -3408,7 +3408,7 @@
       ]
     },
     {
-      "species": "SPECIES_VILEPLUME",
+      "species": "VILEPLUME",
       "hp": 75,
       "atk": 80,
       "def": 85,
@@ -3431,10 +3431,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_GRASS",
         "EGG_GROUP_GRASS"
@@ -3482,7 +3482,7 @@
       ]
     },
     {
-      "species": "SPECIES_PARAS",
+      "species": "PARAS",
       "hp": 35,
       "atk": 70,
       "def": 55,
@@ -3505,10 +3505,10 @@
         "ITEM_TINYMUSHROOM",
         "ITEM_BIG_MUSHROOM"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_GRASS"
@@ -3559,7 +3559,7 @@
       ]
     },
     {
-      "species": "SPECIES_PARASECT",
+      "species": "PARASECT",
       "hp": 60,
       "atk": 95,
       "def": 80,
@@ -3582,10 +3582,10 @@
         "ITEM_TINYMUSHROOM",
         "ITEM_BIG_MUSHROOM"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_GRASS"
@@ -3638,7 +3638,7 @@
       ]
     },
     {
-      "species": "SPECIES_VENONAT",
+      "species": "VENONAT",
       "hp": 60,
       "atk": 55,
       "def": 50,
@@ -3661,10 +3661,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -3705,7 +3705,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_VENOMOTH",
+      "species": "VENOMOTH",
       "hp": 70,
       "atk": 65,
       "def": 60,
@@ -3728,10 +3728,10 @@
         "ITEM_NONE",
         "ITEM_SHED_SHELL"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -3781,7 +3781,7 @@
       ]
     },
     {
-      "species": "SPECIES_DIGLETT",
+      "species": "DIGLETT",
       "hp": 10,
       "atk": 55,
       "def": 25,
@@ -3804,10 +3804,10 @@
         "ITEM_NONE",
         "ITEM_SOFT_SAND"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -3854,7 +3854,7 @@
       ]
     },
     {
-      "species": "SPECIES_DUGTRIO",
+      "species": "DUGTRIO",
       "hp": 35,
       "atk": 80,
       "def": 50,
@@ -3877,10 +3877,10 @@
         "ITEM_NONE",
         "ITEM_SOFT_SAND"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -3930,7 +3930,7 @@
       ]
     },
     {
-      "species": "SPECIES_MEOWTH",
+      "species": "MEOWTH",
       "hp": 40,
       "atk": 45,
       "def": 35,
@@ -3953,10 +3953,10 @@
         "ITEM_NONE",
         "ITEM_QUICK_CLAW"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -4012,7 +4012,7 @@
       ]
     },
     {
-      "species": "SPECIES_PERSIAN",
+      "species": "PERSIAN",
       "hp": 65,
       "atk": 70,
       "def": 60,
@@ -4035,10 +4035,10 @@
         "ITEM_NONE",
         "ITEM_QUICK_CLAW"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -4098,7 +4098,7 @@
       ]
     },
     {
-      "species": "SPECIES_PSYDUCK",
+      "species": "PSYDUCK",
       "hp": 50,
       "atk": 52,
       "def": 48,
@@ -4121,10 +4121,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FIELD"
@@ -4179,7 +4179,7 @@
       ]
     },
     {
-      "species": "SPECIES_GOLDUCK",
+      "species": "GOLDUCK",
       "hp": 80,
       "atk": 82,
       "def": 78,
@@ -4202,10 +4202,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FIELD"
@@ -4264,7 +4264,7 @@
       ]
     },
     {
-      "species": "SPECIES_MANKEY",
+      "species": "MANKEY",
       "hp": 40,
       "atk": 80,
       "def": 35,
@@ -4287,10 +4287,10 @@
         "ITEM_NONE",
         "ITEM_PAYAPA_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -4348,7 +4348,7 @@
       ]
     },
     {
-      "species": "SPECIES_PRIMEAPE",
+      "species": "PRIMEAPE",
       "hp": 65,
       "atk": 105,
       "def": 60,
@@ -4371,10 +4371,10 @@
         "ITEM_NONE",
         "ITEM_PAYAPA_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -4435,7 +4435,7 @@
       ]
     },
     {
-      "species": "SPECIES_GROWLITHE",
+      "species": "GROWLITHE",
       "hp": 55,
       "atk": 70,
       "def": 45,
@@ -4458,10 +4458,10 @@
         "ITEM_RAWST_BERRY",
         "ITEM_RAWST_BERRY"
       ],
-      "genderRatio": 63,
+      "genderRatio": 0.25,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -4507,7 +4507,7 @@
       ]
     },
     {
-      "species": "SPECIES_ARCANINE",
+      "species": "ARCANINE",
       "hp": 90,
       "atk": 110,
       "def": 80,
@@ -4530,10 +4530,10 @@
         "ITEM_RAWST_BERRY",
         "ITEM_RAWST_BERRY"
       ],
-      "genderRatio": 63,
+      "genderRatio": 0.25,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -4584,7 +4584,7 @@
       ]
     },
     {
-      "species": "SPECIES_POLIWAG",
+      "species": "POLIWAG",
       "hp": 40,
       "atk": 50,
       "def": 40,
@@ -4607,10 +4607,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_WATER_1"
@@ -4654,7 +4654,7 @@
       ]
     },
     {
-      "species": "SPECIES_POLIWHIRL",
+      "species": "POLIWHIRL",
       "hp": 65,
       "atk": 65,
       "def": 65,
@@ -4677,10 +4677,10 @@
         "ITEM_NONE",
         "ITEM_KINGS_ROCK"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_WATER_1"
@@ -4730,7 +4730,7 @@
       ]
     },
     {
-      "species": "SPECIES_POLIWRATH",
+      "species": "POLIWRATH",
       "hp": 90,
       "atk": 85,
       "def": 95,
@@ -4753,10 +4753,10 @@
         "ITEM_NONE",
         "ITEM_KINGS_ROCK"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_WATER_1"
@@ -4815,7 +4815,7 @@
       ]
     },
     {
-      "species": "SPECIES_ABRA",
+      "species": "ABRA",
       "hp": 25,
       "atk": 20,
       "def": 15,
@@ -4838,10 +4838,10 @@
         "ITEM_NONE",
         "ITEM_TWISTEDSPOON"
       ],
-      "genderRatio": 63,
+      "genderRatio": 0.25,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -4902,7 +4902,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_KADABRA",
+      "species": "KADABRA",
       "hp": 40,
       "atk": 35,
       "def": 30,
@@ -4925,10 +4925,10 @@
         "ITEM_NONE",
         "ITEM_TWISTEDSPOON"
       ],
-      "genderRatio": 63,
+      "genderRatio": 0.25,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -4989,7 +4989,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_ALAKAZAM",
+      "species": "ALAKAZAM",
       "hp": 55,
       "atk": 50,
       "def": 45,
@@ -5012,10 +5012,10 @@
         "ITEM_NONE",
         "ITEM_TWISTEDSPOON"
       ],
-      "genderRatio": 63,
+      "genderRatio": 0.25,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -5079,7 +5079,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_MACHOP",
+      "species": "MACHOP",
       "hp": 70,
       "atk": 80,
       "def": 50,
@@ -5102,10 +5102,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 63,
+      "genderRatio": 0.25,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -5158,7 +5158,7 @@
       ]
     },
     {
-      "species": "SPECIES_MACHOKE",
+      "species": "MACHOKE",
       "hp": 80,
       "atk": 100,
       "def": 70,
@@ -5181,10 +5181,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 63,
+      "genderRatio": 0.25,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -5237,7 +5237,7 @@
       ]
     },
     {
-      "species": "SPECIES_MACHAMP",
+      "species": "MACHAMP",
       "hp": 90,
       "atk": 130,
       "def": 80,
@@ -5260,10 +5260,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 63,
+      "genderRatio": 0.25,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -5319,7 +5319,7 @@
       ]
     },
     {
-      "species": "SPECIES_BELLSPROUT",
+      "species": "BELLSPROUT",
       "hp": 50,
       "atk": 75,
       "def": 35,
@@ -5342,10 +5342,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_GRASS",
         "EGG_GROUP_GRASS"
@@ -5390,7 +5390,7 @@
       ]
     },
     {
-      "species": "SPECIES_WEEPINBELL",
+      "species": "WEEPINBELL",
       "hp": 65,
       "atk": 90,
       "def": 50,
@@ -5413,10 +5413,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_GRASS",
         "EGG_GROUP_GRASS"
@@ -5461,7 +5461,7 @@
       ]
     },
     {
-      "species": "SPECIES_VICTREEBEL",
+      "species": "VICTREEBEL",
       "hp": 80,
       "atk": 105,
       "def": 65,
@@ -5484,10 +5484,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_GRASS",
         "EGG_GROUP_GRASS"
@@ -5534,7 +5534,7 @@
       ]
     },
     {
-      "species": "SPECIES_TENTACOOL",
+      "species": "TENTACOOL",
       "hp": 40,
       "atk": 40,
       "def": 35,
@@ -5557,10 +5557,10 @@
         "ITEM_NONE",
         "ITEM_POISON_BARB"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_3",
         "EGG_GROUP_WATER_3"
@@ -5609,7 +5609,7 @@
       ]
     },
     {
-      "species": "SPECIES_TENTACRUEL",
+      "species": "TENTACRUEL",
       "hp": 80,
       "atk": 70,
       "def": 65,
@@ -5632,10 +5632,10 @@
         "ITEM_NONE",
         "ITEM_POISON_BARB"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_3",
         "EGG_GROUP_WATER_3"
@@ -5686,7 +5686,7 @@
       ]
     },
     {
-      "species": "SPECIES_GEODUDE",
+      "species": "GEODUDE",
       "hp": 40,
       "atk": 80,
       "def": 100,
@@ -5709,10 +5709,10 @@
         "ITEM_NONE",
         "ITEM_EVERSTONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -5765,7 +5765,7 @@
       ]
     },
     {
-      "species": "SPECIES_GRAVELER",
+      "species": "GRAVELER",
       "hp": 55,
       "atk": 95,
       "def": 115,
@@ -5788,10 +5788,10 @@
         "ITEM_NONE",
         "ITEM_EVERSTONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -5844,7 +5844,7 @@
       ]
     },
     {
-      "species": "SPECIES_GOLEM",
+      "species": "GOLEM",
       "hp": 80,
       "atk": 110,
       "def": 130,
@@ -5867,10 +5867,10 @@
         "ITEM_NONE",
         "ITEM_EVERSTONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -5927,7 +5927,7 @@
       ]
     },
     {
-      "species": "SPECIES_PONYTA",
+      "species": "PONYTA",
       "hp": 50,
       "atk": 85,
       "def": 55,
@@ -5950,10 +5950,10 @@
         "ITEM_NONE",
         "ITEM_SHUCA_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -5995,7 +5995,7 @@
       ]
     },
     {
-      "species": "SPECIES_RAPIDASH",
+      "species": "RAPIDASH",
       "hp": 65,
       "atk": 100,
       "def": 70,
@@ -6018,10 +6018,10 @@
         "ITEM_NONE",
         "ITEM_SHUCA_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -6066,7 +6066,7 @@
       ]
     },
     {
-      "species": "SPECIES_SLOWPOKE",
+      "species": "SLOWPOKE",
       "hp": 90,
       "atk": 65,
       "def": 65,
@@ -6089,10 +6089,10 @@
         "ITEM_NONE",
         "ITEM_LAGGING_TAIL"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_WATER_1"
@@ -6153,7 +6153,7 @@
       ]
     },
     {
-      "species": "SPECIES_SLOWBRO",
+      "species": "SLOWBRO",
       "hp": 95,
       "atk": 75,
       "def": 110,
@@ -6176,10 +6176,10 @@
         "ITEM_NONE",
         "ITEM_KINGS_ROCK"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_WATER_1"
@@ -6249,7 +6249,7 @@
       ]
     },
     {
-      "species": "SPECIES_MAGNEMITE",
+      "species": "MAGNEMITE",
       "hp": 25,
       "atk": 35,
       "def": 70,
@@ -6272,10 +6272,10 @@
         "ITEM_NONE",
         "ITEM_METAL_COAT"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -6321,7 +6321,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_MAGNETON",
+      "species": "MAGNETON",
       "hp": 50,
       "atk": 60,
       "def": 95,
@@ -6344,10 +6344,10 @@
         "ITEM_NONE",
         "ITEM_METAL_COAT"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -6395,7 +6395,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_FARFETCHD",
+      "species": "FARFETCHD",
       "hp": 52,
       "atk": 65,
       "def": 55,
@@ -6418,10 +6418,10 @@
         "ITEM_NONE",
         "ITEM_STICK"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FIELD"
@@ -6470,7 +6470,7 @@
       ]
     },
     {
-      "species": "SPECIES_DODUO",
+      "species": "DODUO",
       "hp": 35,
       "atk": 85,
       "def": 45,
@@ -6493,10 +6493,10 @@
         "ITEM_NONE",
         "ITEM_SHARP_BEAK"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -6537,7 +6537,7 @@
       ]
     },
     {
-      "species": "SPECIES_DODRIO",
+      "species": "DODRIO",
       "hp": 60,
       "atk": 110,
       "def": 70,
@@ -6560,10 +6560,10 @@
         "ITEM_NONE",
         "ITEM_SHARP_BEAK"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -6609,7 +6609,7 @@
       ]
     },
     {
-      "species": "SPECIES_SEEL",
+      "species": "SEEL",
       "hp": 65,
       "atk": 45,
       "def": 55,
@@ -6632,10 +6632,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FIELD"
@@ -6680,7 +6680,7 @@
       ]
     },
     {
-      "species": "SPECIES_DEWGONG",
+      "species": "DEWGONG",
       "hp": 90,
       "atk": 70,
       "def": 80,
@@ -6703,10 +6703,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FIELD"
@@ -6754,7 +6754,7 @@
       ]
     },
     {
-      "species": "SPECIES_GRIMER",
+      "species": "GRIMER",
       "hp": 80,
       "atk": 80,
       "def": 50,
@@ -6777,10 +6777,10 @@
         "ITEM_NONE",
         "ITEM_NUGGET"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -6835,7 +6835,7 @@
       ]
     },
     {
-      "species": "SPECIES_MUK",
+      "species": "MUK",
       "hp": 105,
       "atk": 105,
       "def": 75,
@@ -6858,10 +6858,10 @@
         "ITEM_NONE",
         "ITEM_NUGGET"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -6923,7 +6923,7 @@
       ]
     },
     {
-      "species": "SPECIES_SHELLDER",
+      "species": "SHELLDER",
       "hp": 30,
       "atk": 65,
       "def": 100,
@@ -6946,10 +6946,10 @@
         "ITEM_PEARL",
         "ITEM_BIG_PEARL"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_3",
         "EGG_GROUP_WATER_3"
@@ -6992,7 +6992,7 @@
       ]
     },
     {
-      "species": "SPECIES_CLOYSTER",
+      "species": "CLOYSTER",
       "hp": 50,
       "atk": 95,
       "def": 180,
@@ -7015,10 +7015,10 @@
         "ITEM_PEARL",
         "ITEM_BIG_PEARL"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_3",
         "EGG_GROUP_WATER_3"
@@ -7066,7 +7066,7 @@
       ]
     },
     {
-      "species": "SPECIES_GASTLY",
+      "species": "GASTLY",
       "hp": 30,
       "atk": 35,
       "def": 30,
@@ -7089,10 +7089,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -7146,7 +7146,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_HAUNTER",
+      "species": "HAUNTER",
       "hp": 45,
       "atk": 50,
       "def": 45,
@@ -7169,10 +7169,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -7229,7 +7229,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_GENGAR",
+      "species": "GENGAR",
       "hp": 60,
       "atk": 65,
       "def": 60,
@@ -7252,10 +7252,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -7322,7 +7322,7 @@
       ]
     },
     {
-      "species": "SPECIES_ONIX",
+      "species": "ONIX",
       "hp": 35,
       "atk": 45,
       "def": 160,
@@ -7345,10 +7345,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -7404,7 +7404,7 @@
       ]
     },
     {
-      "species": "SPECIES_DROWZEE",
+      "species": "DROWZEE",
       "hp": 60,
       "atk": 48,
       "def": 45,
@@ -7427,10 +7427,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -7487,7 +7487,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_HYPNO",
+      "species": "HYPNO",
       "hp": 85,
       "atk": 73,
       "def": 70,
@@ -7510,10 +7510,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -7573,7 +7573,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_KRABBY",
+      "species": "KRABBY",
       "hp": 30,
       "atk": 105,
       "def": 90,
@@ -7596,10 +7596,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_3",
         "EGG_GROUP_WATER_3"
@@ -7652,7 +7652,7 @@
       ]
     },
     {
-      "species": "SPECIES_KINGLER",
+      "species": "KINGLER",
       "hp": 55,
       "atk": 130,
       "def": 115,
@@ -7675,10 +7675,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_3",
         "EGG_GROUP_WATER_3"
@@ -7733,7 +7733,7 @@
       ]
     },
     {
-      "species": "SPECIES_VOLTORB",
+      "species": "VOLTORB",
       "hp": 40,
       "atk": 30,
       "def": 50,
@@ -7756,10 +7756,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -7803,7 +7803,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_ELECTRODE",
+      "species": "ELECTRODE",
       "hp": 60,
       "atk": 50,
       "def": 70,
@@ -7826,10 +7826,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -7875,7 +7875,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_EXEGGCUTE",
+      "species": "EXEGGCUTE",
       "hp": 60,
       "atk": 40,
       "def": 80,
@@ -7898,10 +7898,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_GRASS",
         "EGG_GROUP_GRASS"
@@ -7954,7 +7954,7 @@
       ]
     },
     {
-      "species": "SPECIES_EXEGGUTOR",
+      "species": "EXEGGUTOR",
       "hp": 95,
       "atk": 95,
       "def": 85,
@@ -7977,10 +7977,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_GRASS",
         "EGG_GROUP_GRASS"
@@ -8035,7 +8035,7 @@
       ]
     },
     {
-      "species": "SPECIES_CUBONE",
+      "species": "CUBONE",
       "hp": 50,
       "atk": 50,
       "def": 95,
@@ -8058,10 +8058,10 @@
         "ITEM_NONE",
         "ITEM_THICK_CLUB"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_MONSTER"
@@ -8117,7 +8117,7 @@
       ]
     },
     {
-      "species": "SPECIES_MAROWAK",
+      "species": "MAROWAK",
       "hp": 60,
       "atk": 80,
       "def": 110,
@@ -8140,10 +8140,10 @@
         "ITEM_NONE",
         "ITEM_THICK_CLUB"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_MONSTER"
@@ -8203,7 +8203,7 @@
       ]
     },
     {
-      "species": "SPECIES_HITMONLEE",
+      "species": "HITMONLEE",
       "hp": 50,
       "atk": 120,
       "def": 53,
@@ -8226,10 +8226,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 0,
+      "genderRatio": 0.0,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -8279,7 +8279,7 @@
       ]
     },
     {
-      "species": "SPECIES_HITMONCHAN",
+      "species": "HITMONCHAN",
       "hp": 50,
       "atk": 105,
       "def": 79,
@@ -8302,10 +8302,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 0,
+      "genderRatio": 0.0,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -8355,7 +8355,7 @@
       ]
     },
     {
-      "species": "SPECIES_LICKITUNG",
+      "species": "LICKITUNG",
       "hp": 90,
       "atk": 55,
       "def": 75,
@@ -8378,10 +8378,10 @@
         "ITEM_NONE",
         "ITEM_LAGGING_TAIL"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_MONSTER"
@@ -8447,7 +8447,7 @@
       ]
     },
     {
-      "species": "SPECIES_KOFFING",
+      "species": "KOFFING",
       "hp": 40,
       "atk": 65,
       "def": 95,
@@ -8470,10 +8470,10 @@
         "ITEM_NONE",
         "ITEM_SMOKE_BALL"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -8524,7 +8524,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_WEEZING",
+      "species": "WEEZING",
       "hp": 65,
       "atk": 90,
       "def": 120,
@@ -8547,10 +8547,10 @@
         "ITEM_NONE",
         "ITEM_SMOKE_BALL"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -8603,7 +8603,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_RHYHORN",
+      "species": "RHYHORN",
       "hp": 80,
       "atk": 85,
       "def": 95,
@@ -8626,10 +8626,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_FIELD"
@@ -8690,7 +8690,7 @@
       ]
     },
     {
-      "species": "SPECIES_RHYDON",
+      "species": "RHYDON",
       "hp": 105,
       "atk": 130,
       "def": 120,
@@ -8713,10 +8713,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_FIELD"
@@ -8787,7 +8787,7 @@
       ]
     },
     {
-      "species": "SPECIES_CHANSEY",
+      "species": "CHANSEY",
       "hp": 250,
       "atk": 5,
       "def": 5,
@@ -8810,10 +8810,10 @@
         "ITEM_OVAL_STONE",
         "ITEM_LUCKY_EGG"
       ],
-      "genderRatio": 254,
+      "genderRatio": 1.0,
       "eggCycles": 40,
       "friendship": 140,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_FAIRY"
@@ -8888,7 +8888,7 @@
       ]
     },
     {
-      "species": "SPECIES_TANGELA",
+      "species": "TANGELA",
       "hp": 65,
       "atk": 55,
       "def": 115,
@@ -8911,10 +8911,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_GRASS",
         "EGG_GROUP_GRASS"
@@ -8965,7 +8965,7 @@
       ]
     },
     {
-      "species": "SPECIES_KANGASKHAN",
+      "species": "KANGASKHAN",
       "hp": 105,
       "atk": 95,
       "def": 80,
@@ -8988,10 +8988,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 254,
+      "genderRatio": 1.0,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_MONSTER"
@@ -9061,7 +9061,7 @@
       ]
     },
     {
-      "species": "SPECIES_HORSEA",
+      "species": "HORSEA",
       "hp": 30,
       "atk": 40,
       "def": 70,
@@ -9084,10 +9084,10 @@
         "ITEM_NONE",
         "ITEM_DRAGON_SCALE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_DRAGON"
@@ -9131,7 +9131,7 @@
       ]
     },
     {
-      "species": "SPECIES_SEADRA",
+      "species": "SEADRA",
       "hp": 55,
       "atk": 65,
       "def": 95,
@@ -9154,10 +9154,10 @@
         "ITEM_NONE",
         "ITEM_DRAGON_SCALE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_DRAGON"
@@ -9203,7 +9203,7 @@
       ]
     },
     {
-      "species": "SPECIES_GOLDEEN",
+      "species": "GOLDEEN",
       "hp": 45,
       "atk": 67,
       "def": 60,
@@ -9226,10 +9226,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_2",
         "EGG_GROUP_WATER_2"
@@ -9271,7 +9271,7 @@
       ]
     },
     {
-      "species": "SPECIES_SEAKING",
+      "species": "SEAKING",
       "hp": 80,
       "atk": 92,
       "def": 65,
@@ -9294,10 +9294,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_2",
         "EGG_GROUP_WATER_2"
@@ -9341,7 +9341,7 @@
       ]
     },
     {
-      "species": "SPECIES_STARYU",
+      "species": "STARYU",
       "hp": 30,
       "atk": 45,
       "def": 55,
@@ -9364,10 +9364,10 @@
         "ITEM_STARDUST",
         "ITEM_STAR_PIECE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_3",
         "EGG_GROUP_WATER_3"
@@ -9418,7 +9418,7 @@
       ]
     },
     {
-      "species": "SPECIES_STARMIE",
+      "species": "STARMIE",
       "hp": 60,
       "atk": 75,
       "def": 85,
@@ -9441,10 +9441,10 @@
         "ITEM_STARDUST",
         "ITEM_STAR_PIECE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_3",
         "EGG_GROUP_WATER_3"
@@ -9502,7 +9502,7 @@
       ]
     },
     {
-      "species": "SPECIES_MR_MIME",
+      "species": "MR_MIME",
       "hp": 40,
       "atk": 45,
       "def": 65,
@@ -9525,10 +9525,10 @@
         "ITEM_NONE",
         "ITEM_LEPPA_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -9596,7 +9596,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_SCYTHER",
+      "species": "SCYTHER",
       "hp": 70,
       "atk": 110,
       "def": 80,
@@ -9619,10 +9619,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -9673,7 +9673,7 @@
       ]
     },
     {
-      "species": "SPECIES_JYNX",
+      "species": "JYNX",
       "hp": 65,
       "atk": 50,
       "def": 35,
@@ -9696,10 +9696,10 @@
         "ITEM_ASPEAR_BERRY",
         "ITEM_ASPEAR_BERRY"
       ],
-      "genderRatio": 254,
+      "genderRatio": 1.0,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -9762,7 +9762,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_ELECTABUZZ",
+      "species": "ELECTABUZZ",
       "hp": 65,
       "atk": 83,
       "def": 57,
@@ -9785,10 +9785,10 @@
         "ITEM_ELECTIRIZER",
         "ITEM_NONE"
       ],
-      "genderRatio": 63,
+      "genderRatio": 0.25,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -9842,7 +9842,7 @@
       ]
     },
     {
-      "species": "SPECIES_MAGMAR",
+      "species": "MAGMAR",
       "hp": 65,
       "atk": 95,
       "def": 57,
@@ -9865,10 +9865,10 @@
         "ITEM_NONE",
         "ITEM_MAGMARIZER"
       ],
-      "genderRatio": 63,
+      "genderRatio": 0.25,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -9919,7 +9919,7 @@
       ]
     },
     {
-      "species": "SPECIES_PINSIR",
+      "species": "PINSIR",
       "hp": 65,
       "atk": 125,
       "def": 100,
@@ -9942,10 +9942,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -10002,7 +10002,7 @@
       ]
     },
     {
-      "species": "SPECIES_TAUROS",
+      "species": "TAUROS",
       "hp": 75,
       "atk": 100,
       "def": 95,
@@ -10025,10 +10025,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 0,
+      "genderRatio": 0.0,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -10086,7 +10086,7 @@
       ]
     },
     {
-      "species": "SPECIES_MAGIKARP",
+      "species": "MAGIKARP",
       "hp": 20,
       "atk": 10,
       "def": 55,
@@ -10109,10 +10109,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 5,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_2",
         "EGG_GROUP_DRAGON"
@@ -10128,7 +10128,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_GYARADOS",
+      "species": "GYARADOS",
       "hp": 95,
       "atk": 125,
       "def": 79,
@@ -10151,10 +10151,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 5,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_2",
         "EGG_GROUP_DRAGON"
@@ -10215,7 +10215,7 @@
       ]
     },
     {
-      "species": "SPECIES_LAPRAS",
+      "species": "LAPRAS",
       "hp": 130,
       "atk": 85,
       "def": 80,
@@ -10238,10 +10238,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 40,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_WATER_1"
@@ -10297,7 +10297,7 @@
       ]
     },
     {
-      "species": "SPECIES_DITTO",
+      "species": "DITTO",
       "hp": 48,
       "atk": 48,
       "def": 48,
@@ -10320,10 +10320,10 @@
         "ITEM_QUICK_POWDER",
         "ITEM_METAL_POWDER"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_DITTO",
         "EGG_GROUP_DITTO"
@@ -10339,7 +10339,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_EEVEE",
+      "species": "EEVEE",
       "hp": 55,
       "atk": 55,
       "def": 50,
@@ -10362,10 +10362,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 35,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -10403,7 +10403,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_VAPOREON",
+      "species": "VAPOREON",
       "hp": 130,
       "atk": 65,
       "def": 60,
@@ -10426,10 +10426,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 35,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -10480,7 +10480,7 @@
       ]
     },
     {
-      "species": "SPECIES_JOLTEON",
+      "species": "JOLTEON",
       "hp": 65,
       "atk": 65,
       "def": 60,
@@ -10503,10 +10503,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 35,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -10557,7 +10557,7 @@
       ]
     },
     {
-      "species": "SPECIES_FLAREON",
+      "species": "FLAREON",
       "hp": 65,
       "atk": 130,
       "def": 60,
@@ -10580,10 +10580,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 35,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -10631,7 +10631,7 @@
       ]
     },
     {
-      "species": "SPECIES_PORYGON",
+      "species": "PORYGON",
       "hp": 65,
       "atk": 60,
       "def": 70,
@@ -10654,10 +10654,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -10710,7 +10710,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_OMANYTE",
+      "species": "OMANYTE",
       "hp": 35,
       "atk": 40,
       "def": 100,
@@ -10733,10 +10733,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 30,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_WATER_3"
@@ -10786,7 +10786,7 @@
       ]
     },
     {
-      "species": "SPECIES_OMASTAR",
+      "species": "OMASTAR",
       "hp": 70,
       "atk": 60,
       "def": 125,
@@ -10809,10 +10809,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 30,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_WATER_3"
@@ -10866,7 +10866,7 @@
       ]
     },
     {
-      "species": "SPECIES_KABUTO",
+      "species": "KABUTO",
       "hp": 30,
       "atk": 80,
       "def": 90,
@@ -10889,10 +10889,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 30,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_WATER_3"
@@ -10943,7 +10943,7 @@
       ]
     },
     {
-      "species": "SPECIES_KABUTOPS",
+      "species": "KABUTOPS",
       "hp": 60,
       "atk": 115,
       "def": 105,
@@ -10966,10 +10966,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 30,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_WATER_3"
@@ -11029,7 +11029,7 @@
       ]
     },
     {
-      "species": "SPECIES_AERODACTYL",
+      "species": "AERODACTYL",
       "hp": 80,
       "atk": 105,
       "def": 65,
@@ -11052,10 +11052,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 35,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -11117,7 +11117,7 @@
       ]
     },
     {
-      "species": "SPECIES_SNORLAX",
+      "species": "SNORLAX",
       "hp": 160,
       "atk": 110,
       "def": 65,
@@ -11140,10 +11140,10 @@
         "ITEM_LEFTOVERS",
         "ITEM_LEFTOVERS"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 40,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_MONSTER"
@@ -11205,7 +11205,7 @@
       ]
     },
     {
-      "species": "SPECIES_ARTICUNO",
+      "species": "ARTICUNO",
       "hp": 90,
       "atk": 85,
       "def": 100,
@@ -11228,10 +11228,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 80,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -11283,7 +11283,7 @@
       ]
     },
     {
-      "species": "SPECIES_ZAPDOS",
+      "species": "ZAPDOS",
       "hp": 90,
       "atk": 90,
       "def": 85,
@@ -11306,10 +11306,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 80,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -11362,7 +11362,7 @@
       ]
     },
     {
-      "species": "SPECIES_MOLTRES",
+      "species": "MOLTRES",
       "hp": 90,
       "atk": 100,
       "def": 90,
@@ -11385,10 +11385,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 80,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -11440,7 +11440,7 @@
       ]
     },
     {
-      "species": "SPECIES_DRATINI",
+      "species": "DRATINI",
       "hp": 41,
       "atk": 64,
       "def": 45,
@@ -11463,10 +11463,10 @@
         "ITEM_NONE",
         "ITEM_DRAGON_SCALE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 40,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_DRAGON"
@@ -11518,7 +11518,7 @@
       ]
     },
     {
-      "species": "SPECIES_DRAGONAIR",
+      "species": "DRAGONAIR",
       "hp": 61,
       "atk": 84,
       "def": 65,
@@ -11541,10 +11541,10 @@
         "ITEM_NONE",
         "ITEM_DRAGON_SCALE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 40,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_DRAGON"
@@ -11596,7 +11596,7 @@
       ]
     },
     {
-      "species": "SPECIES_DRAGONITE",
+      "species": "DRAGONITE",
       "hp": 91,
       "atk": 134,
       "def": 95,
@@ -11619,10 +11619,10 @@
         "ITEM_NONE",
         "ITEM_DRAGON_SCALE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 40,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_DRAGON"
@@ -11694,7 +11694,7 @@
       ]
     },
     {
-      "species": "SPECIES_MEWTWO",
+      "species": "MEWTWO",
       "hp": 106,
       "atk": 110,
       "def": 90,
@@ -11717,10 +11717,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 0,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -11805,7 +11805,7 @@
       ]
     },
     {
-      "species": "SPECIES_MEW",
+      "species": "MEW",
       "hp": 100,
       "atk": 100,
       "def": 100,
@@ -11828,10 +11828,10 @@
         "ITEM_LUM_BERRY",
         "ITEM_LUM_BERRY"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 100,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -11949,7 +11949,7 @@
       ]
     },
     {
-      "species": "SPECIES_CHIKORITA",
+      "species": "CHIKORITA",
       "hp": 45,
       "atk": 49,
       "def": 65,
@@ -11972,10 +11972,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_GRASS"
@@ -12022,7 +12022,7 @@
       ]
     },
     {
-      "species": "SPECIES_BAYLEEF",
+      "species": "BAYLEEF",
       "hp": 60,
       "atk": 62,
       "def": 80,
@@ -12045,10 +12045,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_GRASS"
@@ -12097,7 +12097,7 @@
       ]
     },
     {
-      "species": "SPECIES_MEGANIUM",
+      "species": "MEGANIUM",
       "hp": 80,
       "atk": 82,
       "def": 100,
@@ -12120,10 +12120,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_GRASS"
@@ -12176,7 +12176,7 @@
       ]
     },
     {
-      "species": "SPECIES_CYNDAQUIL",
+      "species": "CYNDAQUIL",
       "hp": 39,
       "atk": 52,
       "def": 43,
@@ -12199,10 +12199,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -12244,7 +12244,7 @@
       ]
     },
     {
-      "species": "SPECIES_QUILAVA",
+      "species": "QUILAVA",
       "hp": 58,
       "atk": 64,
       "def": 58,
@@ -12267,10 +12267,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -12317,7 +12317,7 @@
       ]
     },
     {
-      "species": "SPECIES_TYPHLOSION",
+      "species": "TYPHLOSION",
       "hp": 78,
       "atk": 84,
       "def": 78,
@@ -12340,10 +12340,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -12401,7 +12401,7 @@
       ]
     },
     {
-      "species": "SPECIES_TOTODILE",
+      "species": "TOTODILE",
       "hp": 50,
       "atk": 65,
       "def": 64,
@@ -12424,10 +12424,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_WATER_1"
@@ -12479,7 +12479,7 @@
       ]
     },
     {
-      "species": "SPECIES_CROCONAW",
+      "species": "CROCONAW",
       "hp": 65,
       "atk": 80,
       "def": 80,
@@ -12502,10 +12502,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_WATER_1"
@@ -12560,7 +12560,7 @@
       ]
     },
     {
-      "species": "SPECIES_FERALIGATR",
+      "species": "FERALIGATR",
       "hp": 85,
       "atk": 105,
       "def": 100,
@@ -12583,10 +12583,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_WATER_1"
@@ -12649,7 +12649,7 @@
       ]
     },
     {
-      "species": "SPECIES_SENTRET",
+      "species": "SENTRET",
       "hp": 35,
       "atk": 46,
       "def": 34,
@@ -12672,10 +12672,10 @@
         "ITEM_NONE",
         "ITEM_ORAN_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -12730,7 +12730,7 @@
       ]
     },
     {
-      "species": "SPECIES_FURRET",
+      "species": "FURRET",
       "hp": 85,
       "atk": 76,
       "def": 64,
@@ -12753,10 +12753,10 @@
         "ITEM_ORAN_BERRY",
         "ITEM_SITRUS_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -12818,7 +12818,7 @@
       ]
     },
     {
-      "species": "SPECIES_HOOTHOOT",
+      "species": "HOOTHOOT",
       "hp": 60,
       "atk": 30,
       "def": 30,
@@ -12841,10 +12841,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -12894,7 +12894,7 @@
       ]
     },
     {
-      "species": "SPECIES_NOCTOWL",
+      "species": "NOCTOWL",
       "hp": 100,
       "atk": 50,
       "def": 50,
@@ -12917,10 +12917,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -12972,7 +12972,7 @@
       ]
     },
     {
-      "species": "SPECIES_LEDYBA",
+      "species": "LEDYBA",
       "hp": 40,
       "atk": 20,
       "def": 30,
@@ -12995,10 +12995,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -13049,7 +13049,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_LEDIAN",
+      "species": "LEDIAN",
       "hp": 55,
       "atk": 35,
       "def": 50,
@@ -13072,10 +13072,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -13132,7 +13132,7 @@
       ]
     },
     {
-      "species": "SPECIES_SPINARAK",
+      "species": "SPINARAK",
       "hp": 40,
       "atk": 60,
       "def": 40,
@@ -13155,10 +13155,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -13200,7 +13200,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_ARIADOS",
+      "species": "ARIADOS",
       "hp": 70,
       "atk": 90,
       "def": 70,
@@ -13223,10 +13223,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -13270,7 +13270,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_CROBAT",
+      "species": "CROBAT",
       "hp": 85,
       "atk": 90,
       "def": 80,
@@ -13293,10 +13293,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -13351,7 +13351,7 @@
       ]
     },
     {
-      "species": "SPECIES_CHINCHOU",
+      "species": "CHINCHOU",
       "hp": 75,
       "atk": 38,
       "def": 38,
@@ -13374,10 +13374,10 @@
         "ITEM_NONE",
         "ITEM_DEEPSEASCALE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_2",
         "EGG_GROUP_WATER_2"
@@ -13425,7 +13425,7 @@
       ]
     },
     {
-      "species": "SPECIES_LANTURN",
+      "species": "LANTURN",
       "hp": 125,
       "atk": 58,
       "def": 58,
@@ -13448,10 +13448,10 @@
         "ITEM_NONE",
         "ITEM_DEEPSEASCALE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_2",
         "EGG_GROUP_WATER_2"
@@ -13501,7 +13501,7 @@
       ]
     },
     {
-      "species": "SPECIES_PICHU",
+      "species": "PICHU",
       "hp": 20,
       "atk": 40,
       "def": 15,
@@ -13524,10 +13524,10 @@
         "ITEM_NONE",
         "ITEM_ORAN_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 10,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -13571,7 +13571,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_CLEFFA",
+      "species": "CLEFFA",
       "hp": 50,
       "atk": 25,
       "def": 28,
@@ -13594,10 +13594,10 @@
         "ITEM_LEPPA_BERRY",
         "ITEM_MOON_STONE"
       ],
-      "genderRatio": 191,
+      "genderRatio": 0.75,
       "eggCycles": 10,
       "friendship": 140,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -13651,7 +13651,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_IGGLYBUFF",
+      "species": "IGGLYBUFF",
       "hp": 90,
       "atk": 30,
       "def": 15,
@@ -13674,10 +13674,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 191,
+      "genderRatio": 0.75,
       "eggCycles": 10,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -13730,7 +13730,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_TOGEPI",
+      "species": "TOGEPI",
       "hp": 35,
       "atk": 20,
       "def": 65,
@@ -13753,10 +13753,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 10,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -13809,7 +13809,7 @@
       ]
     },
     {
-      "species": "SPECIES_TOGETIC",
+      "species": "TOGETIC",
       "hp": 55,
       "atk": 40,
       "def": 85,
@@ -13832,10 +13832,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 10,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FAIRY"
@@ -13899,7 +13899,7 @@
       ]
     },
     {
-      "species": "SPECIES_NATU",
+      "species": "NATU",
       "hp": 40,
       "atk": 50,
       "def": 45,
@@ -13922,10 +13922,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -13981,7 +13981,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_XATU",
+      "species": "XATU",
       "hp": 65,
       "atk": 75,
       "def": 70,
@@ -14004,10 +14004,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -14068,7 +14068,7 @@
       ]
     },
     {
-      "species": "SPECIES_MAREEP",
+      "species": "MAREEP",
       "hp": 55,
       "atk": 40,
       "def": 40,
@@ -14091,10 +14091,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_FIELD"
@@ -14136,7 +14136,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_FLAAFFY",
+      "species": "FLAAFFY",
       "hp": 70,
       "atk": 55,
       "def": 55,
@@ -14159,10 +14159,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_FIELD"
@@ -14210,7 +14210,7 @@
       ]
     },
     {
-      "species": "SPECIES_AMPHAROS",
+      "species": "AMPHAROS",
       "hp": 90,
       "atk": 75,
       "def": 75,
@@ -14233,10 +14233,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_FIELD"
@@ -14288,7 +14288,7 @@
       ]
     },
     {
-      "species": "SPECIES_BELLOSSOM",
+      "species": "BELLOSSOM",
       "hp": 75,
       "atk": 80,
       "def": 85,
@@ -14311,10 +14311,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_GRASS",
         "EGG_GROUP_GRASS"
@@ -14363,7 +14363,7 @@
       ]
     },
     {
-      "species": "SPECIES_MARILL",
+      "species": "MARILL",
       "hp": 70,
       "atk": 20,
       "def": 50,
@@ -14386,10 +14386,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 10,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FAIRY"
@@ -14438,7 +14438,7 @@
       ]
     },
     {
-      "species": "SPECIES_AZUMARILL",
+      "species": "AZUMARILL",
       "hp": 100,
       "atk": 50,
       "def": 80,
@@ -14461,10 +14461,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 10,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FAIRY"
@@ -14516,7 +14516,7 @@
       ]
     },
     {
-      "species": "SPECIES_SUDOWOODO",
+      "species": "SUDOWOODO",
       "hp": 70,
       "atk": 100,
       "def": 115,
@@ -14539,10 +14539,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -14596,7 +14596,7 @@
       ]
     },
     {
-      "species": "SPECIES_POLITOED",
+      "species": "POLITOED",
       "hp": 90,
       "atk": 75,
       "def": 75,
@@ -14619,10 +14619,10 @@
         "ITEM_NONE",
         "ITEM_KINGS_ROCK"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_WATER_1"
@@ -14676,7 +14676,7 @@
       ]
     },
     {
-      "species": "SPECIES_HOPPIP",
+      "species": "HOPPIP",
       "hp": 35,
       "atk": 35,
       "def": 40,
@@ -14699,10 +14699,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_GRASS"
@@ -14746,7 +14746,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_SKIPLOOM",
+      "species": "SKIPLOOM",
       "hp": 55,
       "atk": 45,
       "def": 50,
@@ -14769,10 +14769,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_GRASS"
@@ -14816,7 +14816,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_JUMPLUFF",
+      "species": "JUMPLUFF",
       "hp": 75,
       "atk": 55,
       "def": 70,
@@ -14839,10 +14839,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_GRASS"
@@ -14888,7 +14888,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_AIPOM",
+      "species": "AIPOM",
       "hp": 55,
       "atk": 70,
       "def": 55,
@@ -14911,10 +14911,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -14974,7 +14974,7 @@
       ]
     },
     {
-      "species": "SPECIES_SUNKERN",
+      "species": "SUNKERN",
       "hp": 30,
       "atk": 30,
       "def": 30,
@@ -14997,10 +14997,10 @@
         "ITEM_NONE",
         "ITEM_COBA_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_GRASS",
         "EGG_GROUP_GRASS"
@@ -15046,7 +15046,7 @@
       ]
     },
     {
-      "species": "SPECIES_SUNFLORA",
+      "species": "SUNFLORA",
       "hp": 75,
       "atk": 75,
       "def": 55,
@@ -15069,10 +15069,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_GRASS",
         "EGG_GROUP_GRASS"
@@ -15120,7 +15120,7 @@
       ]
     },
     {
-      "species": "SPECIES_YANMA",
+      "species": "YANMA",
       "hp": 65,
       "atk": 65,
       "def": 45,
@@ -15143,10 +15143,10 @@
         "ITEM_NONE",
         "ITEM_WIDE_LENS"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -15194,7 +15194,7 @@
       ]
     },
     {
-      "species": "SPECIES_WOOPER",
+      "species": "WOOPER",
       "hp": 55,
       "atk": 45,
       "def": 45,
@@ -15217,10 +15217,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FIELD"
@@ -15268,7 +15268,7 @@
       ]
     },
     {
-      "species": "SPECIES_QUAGSIRE",
+      "species": "QUAGSIRE",
       "hp": 95,
       "atk": 85,
       "def": 85,
@@ -15291,10 +15291,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FIELD"
@@ -15352,7 +15352,7 @@
       ]
     },
     {
-      "species": "SPECIES_ESPEON",
+      "species": "ESPEON",
       "hp": 65,
       "atk": 65,
       "def": 60,
@@ -15375,10 +15375,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 35,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -15430,7 +15430,7 @@
       ]
     },
     {
-      "species": "SPECIES_UMBREON",
+      "species": "UMBREON",
       "hp": 95,
       "atk": 65,
       "def": 110,
@@ -15453,10 +15453,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 35,
       "friendship": 35,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -15507,7 +15507,7 @@
       ]
     },
     {
-      "species": "SPECIES_MURKROW",
+      "species": "MURKROW",
       "hp": 60,
       "atk": 85,
       "def": 42,
@@ -15530,10 +15530,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 35,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -15588,7 +15588,7 @@
       ]
     },
     {
-      "species": "SPECIES_SLOWKING",
+      "species": "SLOWKING",
       "hp": 95,
       "atk": 75,
       "def": 80,
@@ -15611,10 +15611,10 @@
         "ITEM_NONE",
         "ITEM_KINGS_ROCK"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_WATER_1"
@@ -15684,7 +15684,7 @@
       ]
     },
     {
-      "species": "SPECIES_MISDREAVUS",
+      "species": "MISDREAVUS",
       "hp": 60,
       "atk": 60,
       "def": 60,
@@ -15707,10 +15707,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 35,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -15767,7 +15767,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_UNOWN",
+      "species": "UNOWN",
       "hp": 48,
       "atk": 72,
       "def": 48,
@@ -15790,10 +15790,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 40,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -15809,7 +15809,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_WOBBUFFET",
+      "species": "WOBBUFFET",
       "hp": 190,
       "atk": 33,
       "def": 58,
@@ -15832,10 +15832,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -15851,7 +15851,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_GIRAFARIG",
+      "species": "GIRAFARIG",
       "hp": 70,
       "atk": 80,
       "def": 65,
@@ -15874,10 +15874,10 @@
         "ITEM_NONE",
         "ITEM_PERSIM_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -15936,7 +15936,7 @@
       ]
     },
     {
-      "species": "SPECIES_PINECO",
+      "species": "PINECO",
       "hp": 50,
       "atk": 65,
       "def": 90,
@@ -15959,10 +15959,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -16012,7 +16012,7 @@
       ]
     },
     {
-      "species": "SPECIES_FORRETRESS",
+      "species": "FORRETRESS",
       "hp": 75,
       "atk": 90,
       "def": 140,
@@ -16035,10 +16035,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -16092,7 +16092,7 @@
       ]
     },
     {
-      "species": "SPECIES_DUNSPARCE",
+      "species": "DUNSPARCE",
       "hp": 100,
       "atk": 70,
       "def": 70,
@@ -16115,10 +16115,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -16181,7 +16181,7 @@
       ]
     },
     {
-      "species": "SPECIES_GLIGAR",
+      "species": "GLIGAR",
       "hp": 65,
       "atk": 75,
       "def": 105,
@@ -16204,10 +16204,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -16272,7 +16272,7 @@
       ]
     },
     {
-      "species": "SPECIES_STEELIX",
+      "species": "STEELIX",
       "hp": 75,
       "atk": 85,
       "def": 200,
@@ -16295,10 +16295,10 @@
         "ITEM_NONE",
         "ITEM_METAL_COAT"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -16358,7 +16358,7 @@
       ]
     },
     {
-      "species": "SPECIES_SNUBBULL",
+      "species": "SNUBBULL",
       "hp": 60,
       "atk": 80,
       "def": 50,
@@ -16381,10 +16381,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 191,
+      "genderRatio": 0.75,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FAIRY"
@@ -16444,7 +16444,7 @@
       ]
     },
     {
-      "species": "SPECIES_GRANBULL",
+      "species": "GRANBULL",
       "hp": 90,
       "atk": 120,
       "def": 75,
@@ -16467,10 +16467,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 191,
+      "genderRatio": 0.75,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FAIRY"
@@ -16538,7 +16538,7 @@
       ]
     },
     {
-      "species": "SPECIES_QWILFISH",
+      "species": "QWILFISH",
       "hp": 65,
       "atk": 95,
       "def": 75,
@@ -16561,10 +16561,10 @@
         "ITEM_NONE",
         "ITEM_POISON_BARB"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_2",
         "EGG_GROUP_WATER_2"
@@ -16615,7 +16615,7 @@
       ]
     },
     {
-      "species": "SPECIES_SCIZOR",
+      "species": "SCIZOR",
       "hp": 70,
       "atk": 130,
       "def": 100,
@@ -16638,10 +16638,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -16696,7 +16696,7 @@
       ]
     },
     {
-      "species": "SPECIES_SHUCKLE",
+      "species": "SHUCKLE",
       "hp": 20,
       "atk": 10,
       "def": 230,
@@ -16719,10 +16719,10 @@
         "ITEM_ORAN_BERRY",
         "ITEM_ORAN_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -16771,7 +16771,7 @@
       ]
     },
     {
-      "species": "SPECIES_HERACROSS",
+      "species": "HERACROSS",
       "hp": 80,
       "atk": 125,
       "def": 75,
@@ -16794,10 +16794,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -16852,7 +16852,7 @@
       ]
     },
     {
-      "species": "SPECIES_SNEASEL",
+      "species": "SNEASEL",
       "hp": 55,
       "atk": 95,
       "def": 55,
@@ -16875,10 +16875,10 @@
         "ITEM_GRIP_CLAW",
         "ITEM_QUICK_CLAW"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 35,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -16944,7 +16944,7 @@
       ]
     },
     {
-      "species": "SPECIES_TEDDIURSA",
+      "species": "TEDDIURSA",
       "hp": 60,
       "atk": 80,
       "def": 50,
@@ -16967,10 +16967,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -17025,7 +17025,7 @@
       ]
     },
     {
-      "species": "SPECIES_URSARING",
+      "species": "URSARING",
       "hp": 90,
       "atk": 130,
       "def": 75,
@@ -17048,10 +17048,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -17112,7 +17112,7 @@
       ]
     },
     {
-      "species": "SPECIES_SLUGMA",
+      "species": "SLUGMA",
       "hp": 40,
       "atk": 40,
       "def": 40,
@@ -17135,10 +17135,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -17182,7 +17182,7 @@
       ]
     },
     {
-      "species": "SPECIES_MAGCARGO",
+      "species": "MAGCARGO",
       "hp": 50,
       "atk": 50,
       "def": 120,
@@ -17205,10 +17205,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -17263,7 +17263,7 @@
       ]
     },
     {
-      "species": "SPECIES_SWINUB",
+      "species": "SWINUB",
       "hp": 50,
       "atk": 50,
       "def": 40,
@@ -17286,10 +17286,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -17338,7 +17338,7 @@
       ]
     },
     {
-      "species": "SPECIES_PILOSWINE",
+      "species": "PILOSWINE",
       "hp": 100,
       "atk": 100,
       "def": 80,
@@ -17361,10 +17361,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -17417,7 +17417,7 @@
       ]
     },
     {
-      "species": "SPECIES_CORSOLA",
+      "species": "CORSOLA",
       "hp": 55,
       "atk": 55,
       "def": 85,
@@ -17440,10 +17440,10 @@
         "ITEM_NONE",
         "ITEM_HARD_STONE"
       ],
-      "genderRatio": 191,
+      "genderRatio": 0.75,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_WATER_3"
@@ -17502,7 +17502,7 @@
       ]
     },
     {
-      "species": "SPECIES_REMORAID",
+      "species": "REMORAID",
       "hp": 35,
       "atk": 65,
       "def": 35,
@@ -17525,10 +17525,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_WATER_2"
@@ -17578,7 +17578,7 @@
       ]
     },
     {
-      "species": "SPECIES_OCTILLERY",
+      "species": "OCTILLERY",
       "hp": 75,
       "atk": 105,
       "def": 75,
@@ -17601,10 +17601,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_WATER_2"
@@ -17659,7 +17659,7 @@
       ]
     },
     {
-      "species": "SPECIES_DELIBIRD",
+      "species": "DELIBIRD",
       "hp": 45,
       "atk": 55,
       "def": 45,
@@ -17682,10 +17682,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FIELD"
@@ -17734,7 +17734,7 @@
       ]
     },
     {
-      "species": "SPECIES_MANTINE",
+      "species": "MANTINE",
       "hp": 65,
       "atk": 40,
       "def": 70,
@@ -17757,10 +17757,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_WATER_1"
@@ -17810,7 +17810,7 @@
       ]
     },
     {
-      "species": "SPECIES_SKARMORY",
+      "species": "SKARMORY",
       "hp": 65,
       "atk": 80,
       "def": 140,
@@ -17833,10 +17833,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -17893,7 +17893,7 @@
       ]
     },
     {
-      "species": "SPECIES_HOUNDOUR",
+      "species": "HOUNDOUR",
       "hp": 45,
       "atk": 60,
       "def": 30,
@@ -17916,10 +17916,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -17972,7 +17972,7 @@
       ]
     },
     {
-      "species": "SPECIES_HOUNDOOM",
+      "species": "HOUNDOOM",
       "hp": 75,
       "atk": 90,
       "def": 50,
@@ -17995,10 +17995,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -18054,7 +18054,7 @@
       ]
     },
     {
-      "species": "SPECIES_KINGDRA",
+      "species": "KINGDRA",
       "hp": 75,
       "atk": 95,
       "def": 95,
@@ -18077,10 +18077,10 @@
         "ITEM_NONE",
         "ITEM_DRAGON_SCALE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_DRAGON"
@@ -18126,7 +18126,7 @@
       ]
     },
     {
-      "species": "SPECIES_PHANPY",
+      "species": "PHANPY",
       "hp": 90,
       "atk": 60,
       "def": 60,
@@ -18149,10 +18149,10 @@
         "ITEM_NONE",
         "ITEM_PASSHO_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -18196,7 +18196,7 @@
       ]
     },
     {
-      "species": "SPECIES_DONPHAN",
+      "species": "DONPHAN",
       "hp": 90,
       "atk": 120,
       "def": 120,
@@ -18219,10 +18219,10 @@
         "ITEM_NONE",
         "ITEM_PASSHO_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -18272,7 +18272,7 @@
       ]
     },
     {
-      "species": "SPECIES_PORYGON2",
+      "species": "PORYGON2",
       "hp": 85,
       "atk": 80,
       "def": 90,
@@ -18295,10 +18295,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -18351,7 +18351,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_STANTLER",
+      "species": "STANTLER",
       "hp": 73,
       "atk": 95,
       "def": 62,
@@ -18374,10 +18374,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -18434,7 +18434,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_SMEARGLE",
+      "species": "SMEARGLE",
       "hp": 55,
       "atk": 20,
       "def": 35,
@@ -18457,10 +18457,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -18476,7 +18476,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_TYROGUE",
+      "species": "TYROGUE",
       "hp": 35,
       "atk": 35,
       "def": 35,
@@ -18499,10 +18499,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 0,
+      "genderRatio": 0.0,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -18545,7 +18545,7 @@
       ]
     },
     {
-      "species": "SPECIES_HITMONTOP",
+      "species": "HITMONTOP",
       "hp": 50,
       "atk": 95,
       "def": 95,
@@ -18568,10 +18568,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 0,
+      "genderRatio": 0.0,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -18619,7 +18619,7 @@
       ]
     },
     {
-      "species": "SPECIES_SMOOCHUM",
+      "species": "SMOOCHUM",
       "hp": 45,
       "atk": 30,
       "def": 15,
@@ -18642,10 +18642,10 @@
         "ITEM_ASPEAR_BERRY",
         "ITEM_ASPEAR_BERRY"
       ],
-      "genderRatio": 254,
+      "genderRatio": 1.0,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -18699,7 +18699,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_ELEKID",
+      "species": "ELEKID",
       "hp": 45,
       "atk": 63,
       "def": 37,
@@ -18722,10 +18722,10 @@
         "ITEM_ELECTIRIZER",
         "ITEM_NONE"
       ],
-      "genderRatio": 63,
+      "genderRatio": 0.25,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -18773,7 +18773,7 @@
       ]
     },
     {
-      "species": "SPECIES_MAGBY",
+      "species": "MAGBY",
       "hp": 45,
       "atk": 75,
       "def": 37,
@@ -18796,10 +18796,10 @@
         "ITEM_NONE",
         "ITEM_MAGMARIZER"
       ],
-      "genderRatio": 63,
+      "genderRatio": 0.25,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -18845,7 +18845,7 @@
       ]
     },
     {
-      "species": "SPECIES_MILTANK",
+      "species": "MILTANK",
       "hp": 95,
       "atk": 80,
       "def": 105,
@@ -18868,10 +18868,10 @@
         "ITEM_MOOMOO_MILK",
         "ITEM_MOOMOO_MILK"
       ],
-      "genderRatio": 254,
+      "genderRatio": 1.0,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -18933,7 +18933,7 @@
       ]
     },
     {
-      "species": "SPECIES_BLISSEY",
+      "species": "BLISSEY",
       "hp": 255,
       "atk": 10,
       "def": 10,
@@ -18956,10 +18956,10 @@
         "ITEM_OVAL_STONE",
         "ITEM_LUCKY_EGG"
       ],
-      "genderRatio": 254,
+      "genderRatio": 1.0,
       "eggCycles": 40,
       "friendship": 140,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_FAIRY"
@@ -19036,7 +19036,7 @@
       ]
     },
     {
-      "species": "SPECIES_RAIKOU",
+      "species": "RAIKOU",
       "hp": 90,
       "atk": 85,
       "def": 75,
@@ -19059,10 +19059,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 80,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -19117,7 +19117,7 @@
       ]
     },
     {
-      "species": "SPECIES_ENTEI",
+      "species": "ENTEI",
       "hp": 115,
       "atk": 115,
       "def": 85,
@@ -19140,10 +19140,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 80,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -19198,7 +19198,7 @@
       ]
     },
     {
-      "species": "SPECIES_SUICUNE",
+      "species": "SUICUNE",
       "hp": 100,
       "atk": 75,
       "def": 115,
@@ -19221,10 +19221,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 80,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -19279,7 +19279,7 @@
       ]
     },
     {
-      "species": "SPECIES_LARVITAR",
+      "species": "LARVITAR",
       "hp": 50,
       "atk": 64,
       "def": 50,
@@ -19302,10 +19302,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 40,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_MONSTER"
@@ -19356,7 +19356,7 @@
       ]
     },
     {
-      "species": "SPECIES_PUPITAR",
+      "species": "PUPITAR",
       "hp": 70,
       "atk": 84,
       "def": 70,
@@ -19379,10 +19379,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 40,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_MONSTER"
@@ -19433,7 +19433,7 @@
       ]
     },
     {
-      "species": "SPECIES_TYRANITAR",
+      "species": "TYRANITAR",
       "hp": 100,
       "atk": 134,
       "def": 110,
@@ -19456,10 +19456,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 40,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_MONSTER"
@@ -19534,7 +19534,7 @@
       ]
     },
     {
-      "species": "SPECIES_LUGIA",
+      "species": "LUGIA",
       "hp": 106,
       "atk": 90,
       "def": 130,
@@ -19557,10 +19557,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 0,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -19632,7 +19632,7 @@
       ]
     },
     {
-      "species": "SPECIES_HO_OH",
+      "species": "HO_OH",
       "hp": 106,
       "atk": 130,
       "def": 90,
@@ -19655,10 +19655,10 @@
         "ITEM_SACRED_ASH",
         "ITEM_SACRED_ASH"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 0,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -19725,7 +19725,7 @@
       ]
     },
     {
-      "species": "SPECIES_CELEBI",
+      "species": "CELEBI",
       "hp": 100,
       "atk": 100,
       "def": 100,
@@ -19748,10 +19748,10 @@
         "ITEM_LUM_BERRY",
         "ITEM_LUM_BERRY"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 100,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -19814,7 +19814,7 @@
       ]
     },
     {
-      "species": "SPECIES_TREECKO",
+      "species": "TREECKO",
       "hp": 40,
       "atk": 45,
       "def": 35,
@@ -19837,10 +19837,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_DRAGON"
@@ -19895,7 +19895,7 @@
       ]
     },
     {
-      "species": "SPECIES_GROVYLE",
+      "species": "GROVYLE",
       "hp": 50,
       "atk": 65,
       "def": 45,
@@ -19918,10 +19918,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_DRAGON"
@@ -19978,7 +19978,7 @@
       ]
     },
     {
-      "species": "SPECIES_SCEPTILE",
+      "species": "SCEPTILE",
       "hp": 70,
       "atk": 85,
       "def": 65,
@@ -20001,10 +20001,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_DRAGON"
@@ -20069,7 +20069,7 @@
       ]
     },
     {
-      "species": "SPECIES_TORCHIC",
+      "species": "TORCHIC",
       "hp": 45,
       "atk": 60,
       "def": 40,
@@ -20092,10 +20092,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -20143,7 +20143,7 @@
       ]
     },
     {
-      "species": "SPECIES_COMBUSKEN",
+      "species": "COMBUSKEN",
       "hp": 60,
       "atk": 85,
       "def": 60,
@@ -20166,10 +20166,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -20223,7 +20223,7 @@
       ]
     },
     {
-      "species": "SPECIES_BLAZIKEN",
+      "species": "BLAZIKEN",
       "hp": 80,
       "atk": 120,
       "def": 70,
@@ -20246,10 +20246,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -20310,7 +20310,7 @@
       ]
     },
     {
-      "species": "SPECIES_MUDKIP",
+      "species": "MUDKIP",
       "hp": 50,
       "atk": 70,
       "def": 50,
@@ -20333,10 +20333,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_WATER_1"
@@ -20383,7 +20383,7 @@
       ]
     },
     {
-      "species": "SPECIES_MARSHTOMP",
+      "species": "MARSHTOMP",
       "hp": 70,
       "atk": 85,
       "def": 70,
@@ -20406,10 +20406,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_WATER_1"
@@ -20460,7 +20460,7 @@
       ]
     },
     {
-      "species": "SPECIES_SWAMPERT",
+      "species": "SWAMPERT",
       "hp": 100,
       "atk": 110,
       "def": 90,
@@ -20483,10 +20483,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_WATER_1"
@@ -20545,7 +20545,7 @@
       ]
     },
     {
-      "species": "SPECIES_POOCHYENA",
+      "species": "POOCHYENA",
       "hp": 35,
       "atk": 55,
       "def": 35,
@@ -20568,10 +20568,10 @@
         "ITEM_NONE",
         "ITEM_PECHA_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -20619,7 +20619,7 @@
       ]
     },
     {
-      "species": "SPECIES_MIGHTYENA",
+      "species": "MIGHTYENA",
       "hp": 70,
       "atk": 90,
       "def": 70,
@@ -20642,10 +20642,10 @@
         "ITEM_NONE",
         "ITEM_PECHA_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -20696,7 +20696,7 @@
       ]
     },
     {
-      "species": "SPECIES_ZIGZAGOON",
+      "species": "ZIGZAGOON",
       "hp": 38,
       "atk": 30,
       "def": 41,
@@ -20719,10 +20719,10 @@
         "ITEM_NONE",
         "ITEM_ORAN_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -20775,7 +20775,7 @@
       ]
     },
     {
-      "species": "SPECIES_LINOONE",
+      "species": "LINOONE",
       "hp": 78,
       "atk": 70,
       "def": 61,
@@ -20798,10 +20798,10 @@
         "ITEM_ORAN_BERRY",
         "ITEM_SITRUS_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -20859,7 +20859,7 @@
       ]
     },
     {
-      "species": "SPECIES_WURMPLE",
+      "species": "WURMPLE",
       "hp": 45,
       "atk": 45,
       "def": 35,
@@ -20882,10 +20882,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -20901,7 +20901,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_SILCOON",
+      "species": "SILCOON",
       "hp": 50,
       "atk": 35,
       "def": 55,
@@ -20924,10 +20924,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -20943,7 +20943,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_BEAUTIFLY",
+      "species": "BEAUTIFLY",
       "hp": 60,
       "atk": 70,
       "def": 50,
@@ -20966,10 +20966,10 @@
         "ITEM_NONE",
         "ITEM_SHED_SHELL"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -21019,7 +21019,7 @@
       ]
     },
     {
-      "species": "SPECIES_CASCOON",
+      "species": "CASCOON",
       "hp": 50,
       "atk": 35,
       "def": 55,
@@ -21042,10 +21042,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -21061,7 +21061,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_DUSTOX",
+      "species": "DUSTOX",
       "hp": 60,
       "atk": 50,
       "def": 70,
@@ -21084,10 +21084,10 @@
         "ITEM_NONE",
         "ITEM_SHED_SHELL"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -21138,7 +21138,7 @@
       ]
     },
     {
-      "species": "SPECIES_LOTAD",
+      "species": "LOTAD",
       "hp": 40,
       "atk": 30,
       "def": 30,
@@ -21161,10 +21161,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_GRASS"
@@ -21213,7 +21213,7 @@
       ]
     },
     {
-      "species": "SPECIES_LOMBRE",
+      "species": "LOMBRE",
       "hp": 60,
       "atk": 50,
       "def": 50,
@@ -21236,10 +21236,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_GRASS"
@@ -21294,7 +21294,7 @@
       ]
     },
     {
-      "species": "SPECIES_LUDICOLO",
+      "species": "LUDICOLO",
       "hp": 80,
       "atk": 70,
       "def": 70,
@@ -21317,10 +21317,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_GRASS"
@@ -21380,7 +21380,7 @@
       ]
     },
     {
-      "species": "SPECIES_SEEDOT",
+      "species": "SEEDOT",
       "hp": 40,
       "atk": 40,
       "def": 50,
@@ -21403,10 +21403,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_GRASS"
@@ -21452,7 +21452,7 @@
       ]
     },
     {
-      "species": "SPECIES_NUZLEAF",
+      "species": "NUZLEAF",
       "hp": 70,
       "atk": 70,
       "def": 40,
@@ -21475,10 +21475,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_GRASS"
@@ -21537,7 +21537,7 @@
       ]
     },
     {
-      "species": "SPECIES_SHIFTRY",
+      "species": "SHIFTRY",
       "hp": 90,
       "atk": 100,
       "def": 60,
@@ -21560,10 +21560,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_GRASS"
@@ -21628,7 +21628,7 @@
       ]
     },
     {
-      "species": "SPECIES_TAILLOW",
+      "species": "TAILLOW",
       "hp": 40,
       "atk": 55,
       "def": 30,
@@ -21651,10 +21651,10 @@
         "ITEM_NONE",
         "ITEM_CHARTI_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -21698,7 +21698,7 @@
       ]
     },
     {
-      "species": "SPECIES_SWELLOW",
+      "species": "SWELLOW",
       "hp": 60,
       "atk": 85,
       "def": 60,
@@ -21721,10 +21721,10 @@
         "ITEM_NONE",
         "ITEM_CHARTI_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -21770,7 +21770,7 @@
       ]
     },
     {
-      "species": "SPECIES_WINGULL",
+      "species": "WINGULL",
       "hp": 40,
       "atk": 30,
       "def": 30,
@@ -21793,10 +21793,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FLYING"
@@ -21845,7 +21845,7 @@
       ]
     },
     {
-      "species": "SPECIES_PELIPPER",
+      "species": "PELIPPER",
       "hp": 60,
       "atk": 50,
       "def": 100,
@@ -21868,10 +21868,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FLYING"
@@ -21925,7 +21925,7 @@
       ]
     },
     {
-      "species": "SPECIES_RALTS",
+      "species": "RALTS",
       "hp": 28,
       "atk": 25,
       "def": 25,
@@ -21948,10 +21948,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -22008,7 +22008,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_KIRLIA",
+      "species": "KIRLIA",
       "hp": 38,
       "atk": 35,
       "def": 35,
@@ -22031,10 +22031,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -22091,7 +22091,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_GARDEVOIR",
+      "species": "GARDEVOIR",
       "hp": 68,
       "atk": 65,
       "def": 65,
@@ -22114,10 +22114,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -22178,7 +22178,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_SURSKIT",
+      "species": "SURSKIT",
       "hp": 40,
       "atk": 30,
       "def": 32,
@@ -22201,10 +22201,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_BUG"
@@ -22248,7 +22248,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_MASQUERAIN",
+      "species": "MASQUERAIN",
       "hp": 70,
       "atk": 60,
       "def": 62,
@@ -22271,10 +22271,10 @@
         "ITEM_NONE",
         "ITEM_SILVERPOWDER"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_BUG"
@@ -22327,7 +22327,7 @@
       ]
     },
     {
-      "species": "SPECIES_SHROOMISH",
+      "species": "SHROOMISH",
       "hp": 60,
       "atk": 40,
       "def": 60,
@@ -22350,10 +22350,10 @@
         "ITEM_NONE",
         "ITEM_KEBIA_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 2,
+      "growthRate": "FLUCTUATING",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_GRASS"
@@ -22397,7 +22397,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_BRELOOM",
+      "species": "BRELOOM",
       "hp": 60,
       "atk": 130,
       "def": 80,
@@ -22420,10 +22420,10 @@
         "ITEM_NONE",
         "ITEM_KEBIA_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 2,
+      "growthRate": "FLUCTUATING",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_GRASS"
@@ -22483,7 +22483,7 @@
       ]
     },
     {
-      "species": "SPECIES_SLAKOTH",
+      "species": "SLAKOTH",
       "hp": 60,
       "atk": 60,
       "def": 60,
@@ -22506,10 +22506,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -22566,7 +22566,7 @@
       ]
     },
     {
-      "species": "SPECIES_VIGOROTH",
+      "species": "VIGOROTH",
       "hp": 80,
       "atk": 80,
       "def": 80,
@@ -22589,10 +22589,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -22654,7 +22654,7 @@
       ]
     },
     {
-      "species": "SPECIES_SLAKING",
+      "species": "SLAKING",
       "hp": 150,
       "atk": 160,
       "def": 100,
@@ -22677,10 +22677,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -22744,7 +22744,7 @@
       ]
     },
     {
-      "species": "SPECIES_NINCADA",
+      "species": "NINCADA",
       "hp": 31,
       "atk": 45,
       "def": 90,
@@ -22767,10 +22767,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -22813,7 +22813,7 @@
       ]
     },
     {
-      "species": "SPECIES_NINJASK",
+      "species": "NINJASK",
       "hp": 61,
       "atk": 90,
       "def": 45,
@@ -22836,10 +22836,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -22892,7 +22892,7 @@
       ]
     },
     {
-      "species": "SPECIES_SHEDINJA",
+      "species": "SHEDINJA",
       "hp": 1,
       "atk": 90,
       "def": 45,
@@ -22915,10 +22915,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -22967,7 +22967,7 @@
       ]
     },
     {
-      "species": "SPECIES_WHISMUR",
+      "species": "WHISMUR",
       "hp": 64,
       "atk": 51,
       "def": 23,
@@ -22990,10 +22990,10 @@
         "ITEM_NONE",
         "ITEM_CHESTO_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_FIELD"
@@ -23038,7 +23038,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_LOUDRED",
+      "species": "LOUDRED",
       "hp": 84,
       "atk": 71,
       "def": 43,
@@ -23061,10 +23061,10 @@
         "ITEM_NONE",
         "ITEM_CHESTO_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_FIELD"
@@ -23119,7 +23119,7 @@
       ]
     },
     {
-      "species": "SPECIES_EXPLOUD",
+      "species": "EXPLOUD",
       "hp": 104,
       "atk": 91,
       "def": 63,
@@ -23142,10 +23142,10 @@
         "ITEM_NONE",
         "ITEM_CHESTO_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_FIELD"
@@ -23206,7 +23206,7 @@
       ]
     },
     {
-      "species": "SPECIES_MAKUHITA",
+      "species": "MAKUHITA",
       "hp": 72,
       "atk": 60,
       "def": 30,
@@ -23229,10 +23229,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 63,
+      "genderRatio": 0.25,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 2,
+      "growthRate": "FLUCTUATING",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -23282,7 +23282,7 @@
       ]
     },
     {
-      "species": "SPECIES_HARIYAMA",
+      "species": "HARIYAMA",
       "hp": 144,
       "atk": 120,
       "def": 60,
@@ -23305,10 +23305,10 @@
         "ITEM_NONE",
         "ITEM_KINGS_ROCK"
       ],
-      "genderRatio": 63,
+      "genderRatio": 0.25,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 2,
+      "growthRate": "FLUCTUATING",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -23363,7 +23363,7 @@
       ]
     },
     {
-      "species": "SPECIES_AZURILL",
+      "species": "AZURILL",
       "hp": 50,
       "atk": 20,
       "def": 40,
@@ -23386,10 +23386,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 191,
+      "genderRatio": 0.75,
       "eggCycles": 10,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -23431,7 +23431,7 @@
       ]
     },
     {
-      "species": "SPECIES_NOSEPASS",
+      "species": "NOSEPASS",
       "hp": 30,
       "atk": 45,
       "def": 135,
@@ -23454,10 +23454,10 @@
         "ITEM_NONE",
         "ITEM_HARD_STONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -23508,7 +23508,7 @@
       ]
     },
     {
-      "species": "SPECIES_SKITTY",
+      "species": "SKITTY",
       "hp": 50,
       "atk": 45,
       "def": 45,
@@ -23531,10 +23531,10 @@
         "ITEM_NONE",
         "ITEM_LEPPA_BERRY"
       ],
-      "genderRatio": 191,
+      "genderRatio": 0.75,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FAIRY"
@@ -23588,7 +23588,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_DELCATTY",
+      "species": "DELCATTY",
       "hp": 70,
       "atk": 65,
       "def": 65,
@@ -23611,10 +23611,10 @@
         "ITEM_NONE",
         "ITEM_LEPPA_BERRY"
       ],
-      "genderRatio": 191,
+      "genderRatio": 0.75,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FAIRY"
@@ -23673,7 +23673,7 @@
       ]
     },
     {
-      "species": "SPECIES_SABLEYE",
+      "species": "SABLEYE",
       "hp": 50,
       "atk": 75,
       "def": 75,
@@ -23696,10 +23696,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 35,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -23761,7 +23761,7 @@
       ]
     },
     {
-      "species": "SPECIES_MAWILE",
+      "species": "MAWILE",
       "hp": 50,
       "atk": 85,
       "def": 85,
@@ -23784,10 +23784,10 @@
         "ITEM_NONE",
         "ITEM_OCCA_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FAIRY"
@@ -23849,7 +23849,7 @@
       ]
     },
     {
-      "species": "SPECIES_ARON",
+      "species": "ARON",
       "hp": 50,
       "atk": 70,
       "def": 100,
@@ -23872,10 +23872,10 @@
         "ITEM_NONE",
         "ITEM_HARD_STONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 35,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_MONSTER"
@@ -23927,7 +23927,7 @@
       ]
     },
     {
-      "species": "SPECIES_LAIRON",
+      "species": "LAIRON",
       "hp": 60,
       "atk": 90,
       "def": 140,
@@ -23950,10 +23950,10 @@
         "ITEM_NONE",
         "ITEM_HARD_STONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 35,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_MONSTER"
@@ -24006,7 +24006,7 @@
       ]
     },
     {
-      "species": "SPECIES_AGGRON",
+      "species": "AGGRON",
       "hp": 70,
       "atk": 110,
       "def": 180,
@@ -24029,10 +24029,10 @@
         "ITEM_NONE",
         "ITEM_HARD_STONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 35,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_MONSTER"
@@ -24108,7 +24108,7 @@
       ]
     },
     {
-      "species": "SPECIES_MEDITITE",
+      "species": "MEDITITE",
       "hp": 30,
       "atk": 40,
       "def": 55,
@@ -24131,10 +24131,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -24191,7 +24191,7 @@
       ]
     },
     {
-      "species": "SPECIES_MEDICHAM",
+      "species": "MEDICHAM",
       "hp": 60,
       "atk": 60,
       "def": 75,
@@ -24214,10 +24214,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -24277,7 +24277,7 @@
       ]
     },
     {
-      "species": "SPECIES_ELECTRIKE",
+      "species": "ELECTRIKE",
       "hp": 40,
       "atk": 45,
       "def": 40,
@@ -24300,10 +24300,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -24350,7 +24350,7 @@
       ]
     },
     {
-      "species": "SPECIES_MANECTRIC",
+      "species": "MANECTRIC",
       "hp": 70,
       "atk": 75,
       "def": 60,
@@ -24373,10 +24373,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -24426,7 +24426,7 @@
       ]
     },
     {
-      "species": "SPECIES_PLUSLE",
+      "species": "PLUSLE",
       "hp": 60,
       "atk": 50,
       "def": 40,
@@ -24449,10 +24449,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_FAIRY"
@@ -24496,7 +24496,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_MINUN",
+      "species": "MINUN",
       "hp": 60,
       "atk": 40,
       "def": 50,
@@ -24519,10 +24519,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_FAIRY"
@@ -24566,7 +24566,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_VOLBEAT",
+      "species": "VOLBEAT",
       "hp": 65,
       "atk": 73,
       "def": 55,
@@ -24589,10 +24589,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 0,
+      "genderRatio": 0.0,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_HUMAN_LIKE"
@@ -24647,7 +24647,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_ILLUMISE",
+      "species": "ILLUMISE",
       "hp": 65,
       "atk": 47,
       "def": 55,
@@ -24670,10 +24670,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 254,
+      "genderRatio": 1.0,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 2,
+      "growthRate": "FLUCTUATING",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_HUMAN_LIKE"
@@ -24728,7 +24728,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_ROSELIA",
+      "species": "ROSELIA",
       "hp": 50,
       "atk": 60,
       "def": 45,
@@ -24751,10 +24751,10 @@
         "ITEM_NONE",
         "ITEM_POISON_BARB"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_GRASS"
@@ -24802,7 +24802,7 @@
       ]
     },
     {
-      "species": "SPECIES_GULPIN",
+      "species": "GULPIN",
       "hp": 70,
       "atk": 43,
       "def": 53,
@@ -24825,10 +24825,10 @@
         "ITEM_NONE",
         "ITEM_BIG_PEARL"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 2,
+      "growthRate": "FLUCTUATING",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -24877,7 +24877,7 @@
       ]
     },
     {
-      "species": "SPECIES_SWALOT",
+      "species": "SWALOT",
       "hp": 100,
       "atk": 73,
       "def": 83,
@@ -24900,10 +24900,10 @@
         "ITEM_NONE",
         "ITEM_BIG_PEARL"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 2,
+      "growthRate": "FLUCTUATING",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -24955,7 +24955,7 @@
       ]
     },
     {
-      "species": "SPECIES_CARVANHA",
+      "species": "CARVANHA",
       "hp": 45,
       "atk": 90,
       "def": 20,
@@ -24978,10 +24978,10 @@
         "ITEM_NONE",
         "ITEM_DEEPSEATOOTH"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_2",
         "EGG_GROUP_WATER_2"
@@ -25028,7 +25028,7 @@
       ]
     },
     {
-      "species": "SPECIES_SHARPEDO",
+      "species": "SHARPEDO",
       "hp": 70,
       "atk": 120,
       "def": 40,
@@ -25051,10 +25051,10 @@
         "ITEM_NONE",
         "ITEM_DEEPSEATOOTH"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_2",
         "EGG_GROUP_WATER_2"
@@ -25110,7 +25110,7 @@
       ]
     },
     {
-      "species": "SPECIES_WAILMER",
+      "species": "WAILMER",
       "hp": 130,
       "atk": 70,
       "def": 35,
@@ -25133,10 +25133,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 40,
       "friendship": 70,
-      "growthRate": 2,
+      "growthRate": "FLUCTUATING",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_WATER_2"
@@ -25184,7 +25184,7 @@
       ]
     },
     {
-      "species": "SPECIES_WAILORD",
+      "species": "WAILORD",
       "hp": 170,
       "atk": 90,
       "def": 45,
@@ -25207,10 +25207,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 40,
       "friendship": 70,
-      "growthRate": 2,
+      "growthRate": "FLUCTUATING",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_WATER_2"
@@ -25260,7 +25260,7 @@
       ]
     },
     {
-      "species": "SPECIES_NUMEL",
+      "species": "NUMEL",
       "hp": 60,
       "atk": 60,
       "def": 40,
@@ -25283,10 +25283,10 @@
         "ITEM_RAWST_BERRY",
         "ITEM_RAWST_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -25333,7 +25333,7 @@
       ]
     },
     {
-      "species": "SPECIES_CAMERUPT",
+      "species": "CAMERUPT",
       "hp": 70,
       "atk": 100,
       "def": 70,
@@ -25356,10 +25356,10 @@
         "ITEM_RAWST_BERRY",
         "ITEM_RAWST_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -25414,7 +25414,7 @@
       ]
     },
     {
-      "species": "SPECIES_TORKOAL",
+      "species": "TORKOAL",
       "hp": 70,
       "atk": 85,
       "def": 140,
@@ -25437,10 +25437,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -25493,7 +25493,7 @@
       ]
     },
     {
-      "species": "SPECIES_SPOINK",
+      "species": "SPOINK",
       "hp": 60,
       "atk": 25,
       "def": 35,
@@ -25516,10 +25516,10 @@
         "ITEM_NONE",
         "ITEM_TANGA_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -25575,7 +25575,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_GRUMPIG",
+      "species": "GRUMPIG",
       "hp": 80,
       "atk": 45,
       "def": 65,
@@ -25598,10 +25598,10 @@
         "ITEM_NONE",
         "ITEM_TANGA_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -25665,7 +25665,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_SPINDA",
+      "species": "SPINDA",
       "hp": 60,
       "atk": 60,
       "def": 60,
@@ -25688,10 +25688,10 @@
         "ITEM_NONE",
         "ITEM_CHESTO_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_HUMAN_LIKE"
@@ -25750,7 +25750,7 @@
       ]
     },
     {
-      "species": "SPECIES_TRAPINCH",
+      "species": "TRAPINCH",
       "hp": 45,
       "atk": 100,
       "def": 45,
@@ -25773,10 +25773,10 @@
         "ITEM_NONE",
         "ITEM_SOFT_SAND"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -25821,7 +25821,7 @@
       ]
     },
     {
-      "species": "SPECIES_VIBRAVA",
+      "species": "VIBRAVA",
       "hp": 50,
       "atk": 70,
       "def": 50,
@@ -25844,10 +25844,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -25899,7 +25899,7 @@
       ]
     },
     {
-      "species": "SPECIES_FLYGON",
+      "species": "FLYGON",
       "hp": 80,
       "atk": 100,
       "def": 80,
@@ -25922,10 +25922,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -25984,7 +25984,7 @@
       ]
     },
     {
-      "species": "SPECIES_CACNEA",
+      "species": "CACNEA",
       "hp": 50,
       "atk": 85,
       "def": 40,
@@ -26007,10 +26007,10 @@
         "ITEM_NONE",
         "ITEM_STICKY_BARB"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 35,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_GRASS",
         "EGG_GROUP_HUMAN_LIKE"
@@ -26061,7 +26061,7 @@
       ]
     },
     {
-      "species": "SPECIES_CACTURNE",
+      "species": "CACTURNE",
       "hp": 70,
       "atk": 115,
       "def": 60,
@@ -26084,10 +26084,10 @@
         "ITEM_NONE",
         "ITEM_STICKY_BARB"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 35,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_GRASS",
         "EGG_GROUP_HUMAN_LIKE"
@@ -26143,7 +26143,7 @@
       ]
     },
     {
-      "species": "SPECIES_SWABLU",
+      "species": "SWABLU",
       "hp": 45,
       "atk": 40,
       "def": 60,
@@ -26166,10 +26166,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_DRAGON"
@@ -26217,7 +26217,7 @@
       ]
     },
     {
-      "species": "SPECIES_ALTARIA",
+      "species": "ALTARIA",
       "hp": 75,
       "atk": 70,
       "def": 90,
@@ -26240,10 +26240,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_DRAGON"
@@ -26300,7 +26300,7 @@
       ]
     },
     {
-      "species": "SPECIES_ZANGOOSE",
+      "species": "ZANGOOSE",
       "hp": 73,
       "atk": 115,
       "def": 60,
@@ -26323,10 +26323,10 @@
         "ITEM_NONE",
         "ITEM_QUICK_CLAW"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -26395,7 +26395,7 @@
       ]
     },
     {
-      "species": "SPECIES_SEVIPER",
+      "species": "SEVIPER",
       "hp": 73,
       "atk": 100,
       "def": 60,
@@ -26418,10 +26418,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 2,
+      "growthRate": "FLUCTUATING",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_DRAGON"
@@ -26472,7 +26472,7 @@
       ]
     },
     {
-      "species": "SPECIES_LUNATONE",
+      "species": "LUNATONE",
       "hp": 70,
       "atk": 55,
       "def": 65,
@@ -26495,10 +26495,10 @@
         "ITEM_NONE",
         "ITEM_MOON_STONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -26558,7 +26558,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_SOLROCK",
+      "species": "SOLROCK",
       "hp": 70,
       "atk": 95,
       "def": 85,
@@ -26581,10 +26581,10 @@
         "ITEM_NONE",
         "ITEM_SUN_STONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -26647,7 +26647,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_BARBOACH",
+      "species": "BARBOACH",
       "hp": 50,
       "atk": 48,
       "def": 43,
@@ -26670,10 +26670,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_2",
         "EGG_GROUP_WATER_2"
@@ -26717,7 +26717,7 @@
       ]
     },
     {
-      "species": "SPECIES_WHISCASH",
+      "species": "WHISCASH",
       "hp": 110,
       "atk": 78,
       "def": 73,
@@ -26740,10 +26740,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_2",
         "EGG_GROUP_WATER_2"
@@ -26793,7 +26793,7 @@
       ]
     },
     {
-      "species": "SPECIES_CORPHISH",
+      "species": "CORPHISH",
       "hp": 43,
       "atk": 80,
       "def": 65,
@@ -26816,10 +26816,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 2,
+      "growthRate": "FLUCTUATING",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_WATER_3"
@@ -26875,7 +26875,7 @@
       ]
     },
     {
-      "species": "SPECIES_CRAWDAUNT",
+      "species": "CRAWDAUNT",
       "hp": 63,
       "atk": 120,
       "def": 85,
@@ -26898,10 +26898,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 2,
+      "growthRate": "FLUCTUATING",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_WATER_3"
@@ -26961,7 +26961,7 @@
       ]
     },
     {
-      "species": "SPECIES_BALTOY",
+      "species": "BALTOY",
       "hp": 40,
       "atk": 40,
       "def": 55,
@@ -26984,10 +26984,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -27045,7 +27045,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_CLAYDOL",
+      "species": "CLAYDOL",
       "hp": 60,
       "atk": 70,
       "def": 105,
@@ -27068,10 +27068,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -27135,7 +27135,7 @@
       ]
     },
     {
-      "species": "SPECIES_LILEEP",
+      "species": "LILEEP",
       "hp": 66,
       "atk": 41,
       "def": 77,
@@ -27158,10 +27158,10 @@
         "ITEM_NONE",
         "ITEM_BIG_ROOT"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 30,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_WATER_3",
         "EGG_GROUP_WATER_3"
@@ -27208,7 +27208,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_CRADILY",
+      "species": "CRADILY",
       "hp": 86,
       "atk": 81,
       "def": 97,
@@ -27231,10 +27231,10 @@
         "ITEM_NONE",
         "ITEM_BIG_ROOT"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 30,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_WATER_3",
         "EGG_GROUP_WATER_3"
@@ -27288,7 +27288,7 @@
       ]
     },
     {
-      "species": "SPECIES_ANORITH",
+      "species": "ANORITH",
       "hp": 45,
       "atk": 95,
       "def": 50,
@@ -27311,10 +27311,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 30,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_WATER_3",
         "EGG_GROUP_WATER_3"
@@ -27363,7 +27363,7 @@
       ]
     },
     {
-      "species": "SPECIES_ARMALDO",
+      "species": "ARMALDO",
       "hp": 75,
       "atk": 125,
       "def": 100,
@@ -27386,10 +27386,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 30,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_WATER_3",
         "EGG_GROUP_WATER_3"
@@ -27445,7 +27445,7 @@
       ]
     },
     {
-      "species": "SPECIES_FEEBAS",
+      "species": "FEEBAS",
       "hp": 20,
       "atk": 15,
       "def": 20,
@@ -27468,10 +27468,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_DRAGON"
@@ -27512,7 +27512,7 @@
       ]
     },
     {
-      "species": "SPECIES_MILOTIC",
+      "species": "MILOTIC",
       "hp": 95,
       "atk": 60,
       "def": 79,
@@ -27535,10 +27535,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_DRAGON"
@@ -27586,7 +27586,7 @@
       ]
     },
     {
-      "species": "SPECIES_CASTFORM",
+      "species": "CASTFORM",
       "hp": 70,
       "atk": 70,
       "def": 70,
@@ -27609,10 +27609,10 @@
         "ITEM_MYSTIC_WATER",
         "ITEM_MYSTIC_WATER"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_AMORPHOUS"
@@ -27665,7 +27665,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_KECLEON",
+      "species": "KECLEON",
       "hp": 60,
       "atk": 90,
       "def": 70,
@@ -27688,10 +27688,10 @@
         "ITEM_NONE",
         "ITEM_PERSIM_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -27761,7 +27761,7 @@
       ]
     },
     {
-      "species": "SPECIES_SHUPPET",
+      "species": "SHUPPET",
       "hp": 44,
       "atk": 75,
       "def": 35,
@@ -27784,10 +27784,10 @@
         "ITEM_NONE",
         "ITEM_SPELL_TAG"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 35,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -27843,7 +27843,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_BANETTE",
+      "species": "BANETTE",
       "hp": 64,
       "atk": 115,
       "def": 65,
@@ -27866,10 +27866,10 @@
         "ITEM_NONE",
         "ITEM_SPELL_TAG"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 35,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -27929,7 +27929,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_DUSKULL",
+      "species": "DUSKULL",
       "hp": 20,
       "atk": 40,
       "def": 90,
@@ -27952,10 +27952,10 @@
         "ITEM_NONE",
         "ITEM_KASIB_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 35,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -28010,7 +28010,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_DUSCLOPS",
+      "species": "DUSCLOPS",
       "hp": 40,
       "atk": 70,
       "def": 130,
@@ -28033,10 +28033,10 @@
         "ITEM_NONE",
         "ITEM_KASIB_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 35,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -28101,7 +28101,7 @@
       ]
     },
     {
-      "species": "SPECIES_TROPIUS",
+      "species": "TROPIUS",
       "hp": 99,
       "atk": 68,
       "def": 83,
@@ -28124,10 +28124,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_GRASS"
@@ -28183,7 +28183,7 @@
       ]
     },
     {
-      "species": "SPECIES_CHIMECHO",
+      "species": "CHIMECHO",
       "hp": 65,
       "atk": 50,
       "def": 70,
@@ -28206,10 +28206,10 @@
         "ITEM_NONE",
         "ITEM_COLBUR_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -28264,7 +28264,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_ABSOL",
+      "species": "ABSOL",
       "hp": 65,
       "atk": 130,
       "def": 60,
@@ -28287,10 +28287,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 35,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -28364,7 +28364,7 @@
       ]
     },
     {
-      "species": "SPECIES_WYNAUT",
+      "species": "WYNAUT",
       "hp": 95,
       "atk": 23,
       "def": 48,
@@ -28387,10 +28387,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -28406,7 +28406,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_SNORUNT",
+      "species": "SNORUNT",
       "hp": 50,
       "atk": 50,
       "def": 50,
@@ -28429,10 +28429,10 @@
         "ITEM_NONE",
         "ITEM_BABIRI_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_MINERAL"
@@ -28475,7 +28475,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_GLALIE",
+      "species": "GLALIE",
       "hp": 80,
       "atk": 80,
       "def": 80,
@@ -28498,10 +28498,10 @@
         "ITEM_NONE",
         "ITEM_BABIRI_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_MINERAL"
@@ -28553,7 +28553,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_SPHEAL",
+      "species": "SPHEAL",
       "hp": 70,
       "atk": 40,
       "def": 50,
@@ -28576,10 +28576,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FIELD"
@@ -28627,7 +28627,7 @@
       ]
     },
     {
-      "species": "SPECIES_SEALEO",
+      "species": "SEALEO",
       "hp": 90,
       "atk": 60,
       "def": 70,
@@ -28650,10 +28650,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FIELD"
@@ -28702,7 +28702,7 @@
       ]
     },
     {
-      "species": "SPECIES_WALREIN",
+      "species": "WALREIN",
       "hp": 110,
       "atk": 80,
       "def": 90,
@@ -28725,10 +28725,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FIELD"
@@ -28780,7 +28780,7 @@
       ]
     },
     {
-      "species": "SPECIES_CLAMPERL",
+      "species": "CLAMPERL",
       "hp": 35,
       "atk": 64,
       "def": 85,
@@ -28803,10 +28803,10 @@
         "ITEM_NONE",
         "ITEM_BIG_PEARL"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_WATER_1"
@@ -28848,7 +28848,7 @@
       ]
     },
     {
-      "species": "SPECIES_HUNTAIL",
+      "species": "HUNTAIL",
       "hp": 55,
       "atk": 104,
       "def": 105,
@@ -28871,10 +28871,10 @@
         "ITEM_NONE",
         "ITEM_DEEPSEATOOTH"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_WATER_1"
@@ -28920,7 +28920,7 @@
       ]
     },
     {
-      "species": "SPECIES_GOREBYSS",
+      "species": "GOREBYSS",
       "hp": 55,
       "atk": 84,
       "def": 105,
@@ -28943,10 +28943,10 @@
         "ITEM_NONE",
         "ITEM_DEEPSEASCALE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_WATER_1"
@@ -28994,7 +28994,7 @@
       ]
     },
     {
-      "species": "SPECIES_RELICANTH",
+      "species": "RELICANTH",
       "hp": 100,
       "atk": 90,
       "def": 130,
@@ -29017,10 +29017,10 @@
         "ITEM_NONE",
         "ITEM_DEEPSEASCALE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 40,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_WATER_2"
@@ -29075,7 +29075,7 @@
       ]
     },
     {
-      "species": "SPECIES_LUVDISC",
+      "species": "LUVDISC",
       "hp": 43,
       "atk": 30,
       "def": 55,
@@ -29098,10 +29098,10 @@
         "ITEM_HEART_SCALE",
         "ITEM_NONE"
       ],
-      "genderRatio": 191,
+      "genderRatio": 0.75,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_2",
         "EGG_GROUP_WATER_2"
@@ -29145,7 +29145,7 @@
       ]
     },
     {
-      "species": "SPECIES_BAGON",
+      "species": "BAGON",
       "hp": 45,
       "atk": 75,
       "def": 60,
@@ -29168,10 +29168,10 @@
         "ITEM_NONE",
         "ITEM_DRAGON_FANG"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 40,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_DRAGON",
         "EGG_GROUP_DRAGON"
@@ -29220,7 +29220,7 @@
       ]
     },
     {
-      "species": "SPECIES_SHELGON",
+      "species": "SHELGON",
       "hp": 65,
       "atk": 95,
       "def": 100,
@@ -29243,10 +29243,10 @@
         "ITEM_NONE",
         "ITEM_DRAGON_FANG"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 40,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_DRAGON",
         "EGG_GROUP_DRAGON"
@@ -29295,7 +29295,7 @@
       ]
     },
     {
-      "species": "SPECIES_SALAMENCE",
+      "species": "SALAMENCE",
       "hp": 95,
       "atk": 135,
       "def": 80,
@@ -29318,10 +29318,10 @@
         "ITEM_NONE",
         "ITEM_DRAGON_FANG"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 40,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_DRAGON",
         "EGG_GROUP_DRAGON"
@@ -29379,7 +29379,7 @@
       ]
     },
     {
-      "species": "SPECIES_BELDUM",
+      "species": "BELDUM",
       "hp": 40,
       "atk": 55,
       "def": 80,
@@ -29402,10 +29402,10 @@
         "ITEM_NONE",
         "ITEM_METAL_COAT"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 40,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -29421,7 +29421,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_METANG",
+      "species": "METANG",
       "hp": 60,
       "atk": 75,
       "def": 100,
@@ -29444,10 +29444,10 @@
         "ITEM_NONE",
         "ITEM_METAL_COAT"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 40,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -29504,7 +29504,7 @@
       ]
     },
     {
-      "species": "SPECIES_METAGROSS",
+      "species": "METAGROSS",
       "hp": 80,
       "atk": 135,
       "def": 130,
@@ -29527,10 +29527,10 @@
         "ITEM_NONE",
         "ITEM_METAL_COAT"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 40,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -29588,7 +29588,7 @@
       ]
     },
     {
-      "species": "SPECIES_REGIROCK",
+      "species": "REGIROCK",
       "hp": 80,
       "atk": 100,
       "def": 200,
@@ -29611,10 +29611,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 80,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -29673,7 +29673,7 @@
       ]
     },
     {
-      "species": "SPECIES_REGICE",
+      "species": "REGICE",
       "hp": 80,
       "atk": 50,
       "def": 100,
@@ -29696,10 +29696,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 80,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -29758,7 +29758,7 @@
       ]
     },
     {
-      "species": "SPECIES_REGISTEEL",
+      "species": "REGISTEEL",
       "hp": 80,
       "atk": 75,
       "def": 150,
@@ -29781,10 +29781,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 80,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -29844,7 +29844,7 @@
       ]
     },
     {
-      "species": "SPECIES_LATIAS",
+      "species": "LATIAS",
       "hp": 80,
       "atk": 80,
       "def": 90,
@@ -29867,10 +29867,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 254,
+      "genderRatio": 1.0,
       "eggCycles": 120,
       "friendship": 90,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -29941,7 +29941,7 @@
       ]
     },
     {
-      "species": "SPECIES_LATIOS",
+      "species": "LATIOS",
       "hp": 80,
       "atk": 90,
       "def": 80,
@@ -29964,10 +29964,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 0,
+      "genderRatio": 0.0,
       "eggCycles": 120,
       "friendship": 90,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -30038,7 +30038,7 @@
       ]
     },
     {
-      "species": "SPECIES_KYOGRE",
+      "species": "KYOGRE",
       "hp": 100,
       "atk": 100,
       "def": 90,
@@ -30061,10 +30061,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 0,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -30121,7 +30121,7 @@
       ]
     },
     {
-      "species": "SPECIES_GROUDON",
+      "species": "GROUDON",
       "hp": 100,
       "atk": 150,
       "def": 140,
@@ -30144,10 +30144,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 0,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -30215,7 +30215,7 @@
       ]
     },
     {
-      "species": "SPECIES_RAYQUAZA",
+      "species": "RAYQUAZA",
       "hp": 105,
       "atk": 150,
       "def": 90,
@@ -30238,10 +30238,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 0,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -30313,7 +30313,7 @@
       ]
     },
     {
-      "species": "SPECIES_JIRACHI",
+      "species": "JIRACHI",
       "hp": 100,
       "atk": 100,
       "def": 100,
@@ -30336,10 +30336,10 @@
         "ITEM_STAR_PIECE",
         "ITEM_STAR_PIECE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 100,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -30401,7 +30401,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_DEOXYS",
+      "species": "DEOXYS",
       "hp": 50,
       "atk": 150,
       "def": 50,
@@ -30424,10 +30424,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 0,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -30503,7 +30503,7 @@
       ]
     },
     {
-      "species": "SPECIES_TURTWIG",
+      "species": "TURTWIG",
       "hp": 55,
       "atk": 68,
       "def": 64,
@@ -30526,10 +30526,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_GRASS"
@@ -30580,7 +30580,7 @@
       ]
     },
     {
-      "species": "SPECIES_GROTLE",
+      "species": "GROTLE",
       "hp": 75,
       "atk": 89,
       "def": 85,
@@ -30603,10 +30603,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_GRASS"
@@ -30657,7 +30657,7 @@
       ]
     },
     {
-      "species": "SPECIES_TORTERRA",
+      "species": "TORTERRA",
       "hp": 95,
       "atk": 109,
       "def": 105,
@@ -30680,10 +30680,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_GRASS"
@@ -30743,7 +30743,7 @@
       ]
     },
     {
-      "species": "SPECIES_CHIMCHAR",
+      "species": "CHIMCHAR",
       "hp": 44,
       "atk": 58,
       "def": 44,
@@ -30766,10 +30766,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_HUMAN_LIKE"
@@ -30826,7 +30826,7 @@
       ]
     },
     {
-      "species": "SPECIES_MONFERNO",
+      "species": "MONFERNO",
       "hp": 64,
       "atk": 78,
       "def": 52,
@@ -30849,10 +30849,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_HUMAN_LIKE"
@@ -30913,7 +30913,7 @@
       ]
     },
     {
-      "species": "SPECIES_INFERNAPE",
+      "species": "INFERNAPE",
       "hp": 76,
       "atk": 104,
       "def": 71,
@@ -30936,10 +30936,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_HUMAN_LIKE"
@@ -31007,7 +31007,7 @@
       ]
     },
     {
-      "species": "SPECIES_PIPLUP",
+      "species": "PIPLUP",
       "hp": 53,
       "atk": 51,
       "def": 53,
@@ -31030,10 +31030,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FIELD"
@@ -31085,7 +31085,7 @@
       ]
     },
     {
-      "species": "SPECIES_PRINPLUP",
+      "species": "PRINPLUP",
       "hp": 64,
       "atk": 66,
       "def": 68,
@@ -31108,10 +31108,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FIELD"
@@ -31166,7 +31166,7 @@
       ]
     },
     {
-      "species": "SPECIES_EMPOLEON",
+      "species": "EMPOLEON",
       "hp": 84,
       "atk": 86,
       "def": 88,
@@ -31189,10 +31189,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FIELD"
@@ -31257,7 +31257,7 @@
       ]
     },
     {
-      "species": "SPECIES_STARLY",
+      "species": "STARLY",
       "hp": 40,
       "atk": 55,
       "def": 30,
@@ -31280,10 +31280,10 @@
         "ITEM_NONE",
         "ITEM_YACHE_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -31327,7 +31327,7 @@
       ]
     },
     {
-      "species": "SPECIES_STARAVIA",
+      "species": "STARAVIA",
       "hp": 55,
       "atk": 75,
       "def": 50,
@@ -31350,10 +31350,10 @@
         "ITEM_NONE",
         "ITEM_YACHE_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -31397,7 +31397,7 @@
       ]
     },
     {
-      "species": "SPECIES_STARAPTOR",
+      "species": "STARAPTOR",
       "hp": 85,
       "atk": 120,
       "def": 70,
@@ -31420,10 +31420,10 @@
         "ITEM_NONE",
         "ITEM_YACHE_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -31469,7 +31469,7 @@
       ]
     },
     {
-      "species": "SPECIES_BIDOOF",
+      "species": "BIDOOF",
       "hp": 59,
       "atk": 45,
       "def": 40,
@@ -31492,10 +31492,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FIELD"
@@ -31548,7 +31548,7 @@
       ]
     },
     {
-      "species": "SPECIES_BIBAREL",
+      "species": "BIBAREL",
       "hp": 79,
       "atk": 85,
       "def": 60,
@@ -31571,10 +31571,10 @@
         "ITEM_ORAN_BERRY",
         "ITEM_SITRUS_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FIELD"
@@ -31636,7 +31636,7 @@
       ]
     },
     {
-      "species": "SPECIES_KRICKETOT",
+      "species": "KRICKETOT",
       "hp": 37,
       "atk": 25,
       "def": 41,
@@ -31659,10 +31659,10 @@
         "ITEM_NONE",
         "ITEM_METRONOME"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -31678,7 +31678,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_KRICKETUNE",
+      "species": "KRICKETUNE",
       "hp": 77,
       "atk": 85,
       "def": 51,
@@ -31701,10 +31701,10 @@
         "ITEM_NONE",
         "ITEM_METRONOME"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -31752,7 +31752,7 @@
       ]
     },
     {
-      "species": "SPECIES_SHINX",
+      "species": "SHINX",
       "hp": 45,
       "atk": 65,
       "def": 34,
@@ -31775,10 +31775,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -31824,7 +31824,7 @@
       ]
     },
     {
-      "species": "SPECIES_LUXIO",
+      "species": "LUXIO",
       "hp": 60,
       "atk": 85,
       "def": 49,
@@ -31847,10 +31847,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 100,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -31896,7 +31896,7 @@
       ]
     },
     {
-      "species": "SPECIES_LUXRAY",
+      "species": "LUXRAY",
       "hp": 80,
       "atk": 120,
       "def": 79,
@@ -31919,10 +31919,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -31970,7 +31970,7 @@
       ]
     },
     {
-      "species": "SPECIES_BUDEW",
+      "species": "BUDEW",
       "hp": 40,
       "atk": 30,
       "def": 35,
@@ -31993,10 +31993,10 @@
         "ITEM_NONE",
         "ITEM_POISON_BARB"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -32043,7 +32043,7 @@
       ]
     },
     {
-      "species": "SPECIES_ROSERADE",
+      "species": "ROSERADE",
       "hp": 60,
       "atk": 70,
       "def": 55,
@@ -32066,10 +32066,10 @@
         "ITEM_NONE",
         "ITEM_POISON_BARB"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_GRASS"
@@ -32119,7 +32119,7 @@
       ]
     },
     {
-      "species": "SPECIES_CRANIDOS",
+      "species": "CRANIDOS",
       "hp": 67,
       "atk": 125,
       "def": 40,
@@ -32142,10 +32142,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 30,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_MONSTER"
@@ -32206,7 +32206,7 @@
       ]
     },
     {
-      "species": "SPECIES_RAMPARDOS",
+      "species": "RAMPARDOS",
       "hp": 97,
       "atk": 165,
       "def": 60,
@@ -32229,10 +32229,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 30,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_MONSTER"
@@ -32301,7 +32301,7 @@
       ]
     },
     {
-      "species": "SPECIES_SHIELDON",
+      "species": "SHIELDON",
       "hp": 30,
       "atk": 42,
       "def": 118,
@@ -32324,10 +32324,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 30,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_MONSTER"
@@ -32385,7 +32385,7 @@
       ]
     },
     {
-      "species": "SPECIES_BASTIODON",
+      "species": "BASTIODON",
       "hp": 60,
       "atk": 52,
       "def": 168,
@@ -32408,10 +32408,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 30,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_MONSTER"
@@ -32472,7 +32472,7 @@
       ]
     },
     {
-      "species": "SPECIES_BURMY",
+      "species": "BURMY",
       "hp": 40,
       "atk": 29,
       "def": 45,
@@ -32495,10 +32495,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -32514,7 +32514,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_WORMADAM",
+      "species": "WORMADAM",
       "hp": 60,
       "atk": 59,
       "def": 85,
@@ -32537,10 +32537,10 @@
         "ITEM_NONE",
         "ITEM_SILVERPOWDER"
       ],
-      "genderRatio": 254,
+      "genderRatio": 1.0,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -32590,7 +32590,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_MOTHIM",
+      "species": "MOTHIM",
       "hp": 70,
       "atk": 94,
       "def": 50,
@@ -32613,10 +32613,10 @@
         "ITEM_NONE",
         "ITEM_SILVERPOWDER"
       ],
-      "genderRatio": 0,
+      "genderRatio": 0.0,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -32670,7 +32670,7 @@
       ]
     },
     {
-      "species": "SPECIES_COMBEE",
+      "species": "COMBEE",
       "hp": 30,
       "atk": 30,
       "def": 42,
@@ -32693,10 +32693,10 @@
         "ITEM_HONEY",
         "ITEM_HONEY"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -32712,7 +32712,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_VESPIQUEN",
+      "species": "VESPIQUEN",
       "hp": 70,
       "atk": 80,
       "def": 102,
@@ -32735,10 +32735,10 @@
         "ITEM_NONE",
         "ITEM_POISON_BARB"
       ],
-      "genderRatio": 254,
+      "genderRatio": 1.0,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -32787,7 +32787,7 @@
       ]
     },
     {
-      "species": "SPECIES_PACHIRISU",
+      "species": "PACHIRISU",
       "hp": 60,
       "atk": 45,
       "def": 70,
@@ -32810,10 +32810,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 10,
       "friendship": 100,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FAIRY"
@@ -32861,7 +32861,7 @@
       ]
     },
     {
-      "species": "SPECIES_BUIZEL",
+      "species": "BUIZEL",
       "hp": 55,
       "atk": 65,
       "def": 35,
@@ -32884,10 +32884,10 @@
         "ITEM_NONE",
         "ITEM_WACAN_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FIELD"
@@ -32937,7 +32937,7 @@
       ]
     },
     {
-      "species": "SPECIES_FLOATZEL",
+      "species": "FLOATZEL",
       "hp": 85,
       "atk": 105,
       "def": 55,
@@ -32960,10 +32960,10 @@
         "ITEM_NONE",
         "ITEM_WACAN_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FIELD"
@@ -33020,7 +33020,7 @@
       ]
     },
     {
-      "species": "SPECIES_CHERUBI",
+      "species": "CHERUBI",
       "hp": 45,
       "atk": 35,
       "def": 45,
@@ -33043,10 +33043,10 @@
         "ITEM_NONE",
         "ITEM_MIRACLE_SEED"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_GRASS"
@@ -33088,7 +33088,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_CHERRIM",
+      "species": "CHERRIM",
       "hp": 70,
       "atk": 60,
       "def": 70,
@@ -33111,10 +33111,10 @@
         "ITEM_NONE",
         "ITEM_MIRACLE_SEED"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_GRASS"
@@ -33158,7 +33158,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_SHELLOS",
+      "species": "SHELLOS",
       "hp": 76,
       "atk": 48,
       "def": 48,
@@ -33181,10 +33181,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_AMORPHOUS"
@@ -33225,7 +33225,7 @@
       ]
     },
     {
-      "species": "SPECIES_GASTRODON",
+      "species": "GASTRODON",
       "hp": 111,
       "atk": 83,
       "def": 68,
@@ -33248,10 +33248,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_AMORPHOUS"
@@ -33305,7 +33305,7 @@
       ]
     },
     {
-      "species": "SPECIES_AMBIPOM",
+      "species": "AMBIPOM",
       "hp": 75,
       "atk": 100,
       "def": 66,
@@ -33328,10 +33328,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 100,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -33393,7 +33393,7 @@
       ]
     },
     {
-      "species": "SPECIES_DRIFLOON",
+      "species": "DRIFLOON",
       "hp": 90,
       "atk": 50,
       "def": 34,
@@ -33416,10 +33416,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 30,
       "friendship": 70,
-      "growthRate": 2,
+      "growthRate": "FLUCTUATING",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -33477,7 +33477,7 @@
       ]
     },
     {
-      "species": "SPECIES_DRIFBLIM",
+      "species": "DRIFBLIM",
       "hp": 150,
       "atk": 80,
       "def": 44,
@@ -33500,10 +33500,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 30,
       "friendship": 70,
-      "growthRate": 2,
+      "growthRate": "FLUCTUATING",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -33564,7 +33564,7 @@
       ]
     },
     {
-      "species": "SPECIES_BUNEARY",
+      "species": "BUNEARY",
       "hp": 55,
       "atk": 66,
       "def": 44,
@@ -33587,10 +33587,10 @@
         "ITEM_NONE",
         "ITEM_CHOPLE_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 0,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_HUMAN_LIKE"
@@ -33642,7 +33642,7 @@
       ]
     },
     {
-      "species": "SPECIES_LOPUNNY",
+      "species": "LOPUNNY",
       "hp": 65,
       "atk": 76,
       "def": 84,
@@ -33665,10 +33665,10 @@
         "ITEM_NONE",
         "ITEM_CHOPLE_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 140,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_HUMAN_LIKE"
@@ -33726,7 +33726,7 @@
       ]
     },
     {
-      "species": "SPECIES_MISMAGIUS",
+      "species": "MISMAGIUS",
       "hp": 60,
       "atk": 60,
       "def": 60,
@@ -33749,10 +33749,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 35,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -33812,7 +33812,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_HONCHKROW",
+      "species": "HONCHKROW",
       "hp": 100,
       "atk": 125,
       "def": 52,
@@ -33835,10 +33835,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 35,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -33895,7 +33895,7 @@
       ]
     },
     {
-      "species": "SPECIES_GLAMEOW",
+      "species": "GLAMEOW",
       "hp": 49,
       "atk": 55,
       "def": 42,
@@ -33918,10 +33918,10 @@
         "ITEM_NONE",
         "ITEM_CHERI_BERRY"
       ],
-      "genderRatio": 191,
+      "genderRatio": 0.75,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -33976,7 +33976,7 @@
       ]
     },
     {
-      "species": "SPECIES_PURUGLY",
+      "species": "PURUGLY",
       "hp": 71,
       "atk": 82,
       "def": 64,
@@ -33999,10 +33999,10 @@
         "ITEM_NONE",
         "ITEM_CHERI_BERRY"
       ],
-      "genderRatio": 191,
+      "genderRatio": 0.75,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -34060,7 +34060,7 @@
       ]
     },
     {
-      "species": "SPECIES_CHINGLING",
+      "species": "CHINGLING",
       "hp": 45,
       "atk": 30,
       "def": 50,
@@ -34083,10 +34083,10 @@
         "ITEM_NONE",
         "ITEM_COLBUR_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -34140,7 +34140,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_STUNKY",
+      "species": "STUNKY",
       "hp": 63,
       "atk": 63,
       "def": 47,
@@ -34163,10 +34163,10 @@
         "ITEM_NONE",
         "ITEM_PECHA_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -34220,7 +34220,7 @@
       ]
     },
     {
-      "species": "SPECIES_SKUNTANK",
+      "species": "SKUNTANK",
       "hp": 103,
       "atk": 93,
       "def": 67,
@@ -34243,10 +34243,10 @@
         "ITEM_NONE",
         "ITEM_PECHA_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -34304,7 +34304,7 @@
       ]
     },
     {
-      "species": "SPECIES_BRONZOR",
+      "species": "BRONZOR",
       "hp": 57,
       "atk": 24,
       "def": 86,
@@ -34327,10 +34327,10 @@
         "ITEM_NONE",
         "ITEM_METAL_COAT"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -34387,7 +34387,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_BRONZONG",
+      "species": "BRONZONG",
       "hp": 67,
       "atk": 89,
       "def": 116,
@@ -34410,10 +34410,10 @@
         "ITEM_NONE",
         "ITEM_METAL_COAT"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -34476,7 +34476,7 @@
       ]
     },
     {
-      "species": "SPECIES_BONSLY",
+      "species": "BONSLY",
       "hp": 50,
       "atk": 80,
       "def": 95,
@@ -34499,10 +34499,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -34547,7 +34547,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_MIME_JR",
+      "species": "MIME_JR",
       "hp": 20,
       "atk": 25,
       "def": 45,
@@ -34570,10 +34570,10 @@
         "ITEM_NONE",
         "ITEM_LEPPA_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -34635,7 +34635,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_HAPPINY",
+      "species": "HAPPINY",
       "hp": 100,
       "atk": 5,
       "def": 5,
@@ -34658,10 +34658,10 @@
         "ITEM_OVAL_STONE",
         "ITEM_LUCKY_PUNCH"
       ],
-      "genderRatio": 254,
+      "genderRatio": 1.0,
       "eggCycles": 40,
       "friendship": 140,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -34714,7 +34714,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_CHATOT",
+      "species": "CHATOT",
       "hp": 76,
       "atk": 65,
       "def": 45,
@@ -34737,10 +34737,10 @@
         "ITEM_NONE",
         "ITEM_METRONOME"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 35,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FLYING"
@@ -34786,7 +34786,7 @@
       ]
     },
     {
-      "species": "SPECIES_SPIRITOMB",
+      "species": "SPIRITOMB",
       "hp": 50,
       "atk": 92,
       "def": 108,
@@ -34809,10 +34809,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 30,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -34866,7 +34866,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_GIBLE",
+      "species": "GIBLE",
       "hp": 58,
       "atk": 70,
       "def": 45,
@@ -34889,10 +34889,10 @@
         "ITEM_NONE",
         "ITEM_HABAN_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 40,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_DRAGON"
@@ -34946,7 +34946,7 @@
       ]
     },
     {
-      "species": "SPECIES_GABITE",
+      "species": "GABITE",
       "hp": 68,
       "atk": 90,
       "def": 65,
@@ -34969,10 +34969,10 @@
         "ITEM_NONE",
         "ITEM_HABAN_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 40,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_DRAGON"
@@ -35027,7 +35027,7 @@
       ]
     },
     {
-      "species": "SPECIES_GARCHOMP",
+      "species": "GARCHOMP",
       "hp": 108,
       "atk": 130,
       "def": 95,
@@ -35050,10 +35050,10 @@
         "ITEM_NONE",
         "ITEM_HABAN_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 40,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_DRAGON"
@@ -35116,7 +35116,7 @@
       ]
     },
     {
-      "species": "SPECIES_MUNCHLAX",
+      "species": "MUNCHLAX",
       "hp": 135,
       "atk": 85,
       "def": 40,
@@ -35139,10 +35139,10 @@
         "ITEM_LEFTOVERS",
         "ITEM_LEFTOVERS"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 40,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -35201,7 +35201,7 @@
       ]
     },
     {
-      "species": "SPECIES_RIOLU",
+      "species": "RIOLU",
       "hp": 40,
       "atk": 70,
       "def": 40,
@@ -35224,10 +35224,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -35281,7 +35281,7 @@
       ]
     },
     {
-      "species": "SPECIES_LUCARIO",
+      "species": "LUCARIO",
       "hp": 70,
       "atk": 110,
       "def": 70,
@@ -35304,10 +35304,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_HUMAN_LIKE"
@@ -35372,7 +35372,7 @@
       ]
     },
     {
-      "species": "SPECIES_HIPPOPOTAS",
+      "species": "HIPPOPOTAS",
       "hp": 68,
       "atk": 72,
       "def": 78,
@@ -35395,10 +35395,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 30,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -35443,7 +35443,7 @@
       ]
     },
     {
-      "species": "SPECIES_HIPPOWDON",
+      "species": "HIPPOWDON",
       "hp": 108,
       "atk": 112,
       "def": 118,
@@ -35466,10 +35466,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 30,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -35517,7 +35517,7 @@
       ]
     },
     {
-      "species": "SPECIES_SKORUPI",
+      "species": "SKORUPI",
       "hp": 40,
       "atk": 50,
       "def": 90,
@@ -35540,10 +35540,10 @@
         "ITEM_NONE",
         "ITEM_POISON_BARB"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_WATER_3"
@@ -35600,7 +35600,7 @@
       ]
     },
     {
-      "species": "SPECIES_DRAPION",
+      "species": "DRAPION",
       "hp": 70,
       "atk": 90,
       "def": 110,
@@ -35623,10 +35623,10 @@
         "ITEM_NONE",
         "ITEM_POISON_BARB"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_WATER_3"
@@ -35689,7 +35689,7 @@
       ]
     },
     {
-      "species": "SPECIES_CROAGUNK",
+      "species": "CROAGUNK",
       "hp": 48,
       "atk": 61,
       "def": 40,
@@ -35712,10 +35712,10 @@
         "ITEM_NONE",
         "ITEM_BLACK_SLUDGE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 10,
       "friendship": 100,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -35774,7 +35774,7 @@
       ]
     },
     {
-      "species": "SPECIES_TOXICROAK",
+      "species": "TOXICROAK",
       "hp": 83,
       "atk": 106,
       "def": 65,
@@ -35797,10 +35797,10 @@
         "ITEM_NONE",
         "ITEM_BLACK_SLUDGE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -35864,7 +35864,7 @@
       ]
     },
     {
-      "species": "SPECIES_CARNIVINE",
+      "species": "CARNIVINE",
       "hp": 74,
       "atk": 100,
       "def": 72,
@@ -35887,10 +35887,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_GRASS",
         "EGG_GROUP_GRASS"
@@ -35939,7 +35939,7 @@
       ]
     },
     {
-      "species": "SPECIES_FINNEON",
+      "species": "FINNEON",
       "hp": 49,
       "atk": 49,
       "def": 56,
@@ -35962,10 +35962,10 @@
         "ITEM_NONE",
         "ITEM_RINDO_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_WATER_2",
         "EGG_GROUP_WATER_2"
@@ -36014,7 +36014,7 @@
       ]
     },
     {
-      "species": "SPECIES_LUMINEON",
+      "species": "LUMINEON",
       "hp": 69,
       "atk": 69,
       "def": 76,
@@ -36037,10 +36037,10 @@
         "ITEM_NONE",
         "ITEM_RINDO_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 1,
+      "growthRate": "ERRATIC",
       "eggGroups": [
         "EGG_GROUP_WATER_2",
         "EGG_GROUP_WATER_2"
@@ -36091,7 +36091,7 @@
       ]
     },
     {
-      "species": "SPECIES_MANTYKE",
+      "species": "MANTYKE",
       "hp": 45,
       "atk": 20,
       "def": 50,
@@ -36114,10 +36114,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -36160,7 +36160,7 @@
       ]
     },
     {
-      "species": "SPECIES_SNOVER",
+      "species": "SNOVER",
       "hp": 60,
       "atk": 62,
       "def": 50,
@@ -36183,10 +36183,10 @@
         "ITEM_NONE",
         "ITEM_NEVERMELTICE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_GRASS"
@@ -36236,7 +36236,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_ABOMASNOW",
+      "species": "ABOMASNOW",
       "hp": 90,
       "atk": 92,
       "def": 75,
@@ -36259,10 +36259,10 @@
         "ITEM_NONE",
         "ITEM_NEVERMELTICE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_GRASS"
@@ -36325,7 +36325,7 @@
       ]
     },
     {
-      "species": "SPECIES_WEAVILE",
+      "species": "WEAVILE",
       "hp": 70,
       "atk": 120,
       "def": 65,
@@ -36348,10 +36348,10 @@
         "ITEM_GRIP_CLAW",
         "ITEM_QUICK_CLAW"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 35,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -36420,7 +36420,7 @@
       ]
     },
     {
-      "species": "SPECIES_MAGNEZONE",
+      "species": "MAGNEZONE",
       "hp": 70,
       "atk": 70,
       "def": 115,
@@ -36443,10 +36443,10 @@
         "ITEM_NONE",
         "ITEM_METAL_COAT"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -36494,7 +36494,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_LICKILICKY",
+      "species": "LICKILICKY",
       "hp": 110,
       "atk": 85,
       "def": 95,
@@ -36517,10 +36517,10 @@
         "ITEM_NONE",
         "ITEM_LAGGING_TAIL"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_MONSTER"
@@ -36589,7 +36589,7 @@
       ]
     },
     {
-      "species": "SPECIES_RHYPERIOR",
+      "species": "RHYPERIOR",
       "hp": 115,
       "atk": 140,
       "def": 130,
@@ -36612,10 +36612,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_MONSTER",
         "EGG_GROUP_FIELD"
@@ -36687,7 +36687,7 @@
       ]
     },
     {
-      "species": "SPECIES_TANGROWTH",
+      "species": "TANGROWTH",
       "hp": 100,
       "atk": 100,
       "def": 125,
@@ -36710,10 +36710,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_GRASS",
         "EGG_GROUP_GRASS"
@@ -36774,7 +36774,7 @@
       ]
     },
     {
-      "species": "SPECIES_ELECTIVIRE",
+      "species": "ELECTIVIRE",
       "hp": 75,
       "atk": 123,
       "def": 67,
@@ -36797,10 +36797,10 @@
         "ITEM_ELECTIRIZER",
         "ITEM_NONE"
       ],
-      "genderRatio": 63,
+      "genderRatio": 0.25,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -36861,7 +36861,7 @@
       ]
     },
     {
-      "species": "SPECIES_MAGMORTAR",
+      "species": "MAGMORTAR",
       "hp": 75,
       "atk": 95,
       "def": 67,
@@ -36884,10 +36884,10 @@
         "ITEM_NONE",
         "ITEM_MAGMARIZER"
       ],
-      "genderRatio": 63,
+      "genderRatio": 0.25,
       "eggCycles": 25,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_HUMAN_LIKE",
         "EGG_GROUP_HUMAN_LIKE"
@@ -36945,7 +36945,7 @@
       ]
     },
     {
-      "species": "SPECIES_TOGEKISS",
+      "species": "TOGEKISS",
       "hp": 85,
       "atk": 50,
       "def": 95,
@@ -36968,10 +36968,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 10,
       "friendship": 70,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_FLYING",
         "EGG_GROUP_FAIRY"
@@ -37036,7 +37036,7 @@
       ]
     },
     {
-      "species": "SPECIES_YANMEGA",
+      "species": "YANMEGA",
       "hp": 86,
       "atk": 76,
       "def": 86,
@@ -37059,10 +37059,10 @@
         "ITEM_NONE",
         "ITEM_WIDE_LENS"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -37113,7 +37113,7 @@
       ]
     },
     {
-      "species": "SPECIES_LEAFEON",
+      "species": "LEAFEON",
       "hp": 65,
       "atk": 110,
       "def": 130,
@@ -37136,10 +37136,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 35,
       "friendship": 35,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -37192,7 +37192,7 @@
       ]
     },
     {
-      "species": "SPECIES_GLACEON",
+      "species": "GLACEON",
       "hp": 65,
       "atk": 60,
       "def": 110,
@@ -37215,10 +37215,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 31,
+      "genderRatio": 0.125,
       "eggCycles": 35,
       "friendship": 35,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -37267,7 +37267,7 @@
       ]
     },
     {
-      "species": "SPECIES_GLISCOR",
+      "species": "GLISCOR",
       "hp": 75,
       "atk": 95,
       "def": 125,
@@ -37290,10 +37290,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -37360,7 +37360,7 @@
       ]
     },
     {
-      "species": "SPECIES_MAMOSWINE",
+      "species": "MAMOSWINE",
       "hp": 110,
       "atk": 130,
       "def": 80,
@@ -37383,10 +37383,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_FIELD",
         "EGG_GROUP_FIELD"
@@ -37440,7 +37440,7 @@
       ]
     },
     {
-      "species": "SPECIES_PORYGON_Z",
+      "species": "PORYGON_Z",
       "hp": 85,
       "atk": 80,
       "def": 70,
@@ -37463,10 +37463,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -37521,7 +37521,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_GALLADE",
+      "species": "GALLADE",
       "hp": 68,
       "atk": 125,
       "def": 65,
@@ -37544,10 +37544,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 0,
+      "genderRatio": 0.0,
       "eggCycles": 20,
       "friendship": 35,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -37624,7 +37624,7 @@
       ]
     },
     {
-      "species": "SPECIES_PROBOPASS",
+      "species": "PROBOPASS",
       "hp": 60,
       "atk": 55,
       "def": 145,
@@ -37647,10 +37647,10 @@
         "ITEM_NONE",
         "ITEM_HARD_STONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_MINERAL",
         "EGG_GROUP_MINERAL"
@@ -37704,7 +37704,7 @@
       ]
     },
     {
-      "species": "SPECIES_DUSKNOIR",
+      "species": "DUSKNOIR",
       "hp": 45,
       "atk": 100,
       "def": 135,
@@ -37727,10 +37727,10 @@
         "ITEM_NONE",
         "ITEM_KASIB_BERRY"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 25,
       "friendship": 35,
-      "growthRate": 4,
+      "growthRate": "FAST",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -37796,7 +37796,7 @@
       ]
     },
     {
-      "species": "SPECIES_FROSLASS",
+      "species": "FROSLASS",
       "hp": 70,
       "atk": 80,
       "def": 70,
@@ -37819,10 +37819,10 @@
         "ITEM_NONE",
         "ITEM_BABIRI_BERRY"
       ],
-      "genderRatio": 254,
+      "genderRatio": 1.0,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_FAIRY",
         "EGG_GROUP_MINERAL"
@@ -37880,7 +37880,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_ROTOM",
+      "species": "ROTOM",
       "hp": 50,
       "atk": 50,
       "def": 77,
@@ -37903,10 +37903,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 20,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_AMORPHOUS",
         "EGG_GROUP_AMORPHOUS"
@@ -37954,7 +37954,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_UXIE",
+      "species": "UXIE",
       "hp": 75,
       "atk": 75,
       "def": 130,
@@ -37977,10 +37977,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 80,
       "friendship": 140,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -38042,7 +38042,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_MESPRIT",
+      "species": "MESPRIT",
       "hp": 80,
       "atk": 105,
       "def": 105,
@@ -38065,10 +38065,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 80,
       "friendship": 140,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -38130,7 +38130,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_AZELF",
+      "species": "AZELF",
       "hp": 75,
       "atk": 125,
       "def": 70,
@@ -38153,10 +38153,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 80,
       "friendship": 140,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -38222,7 +38222,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_DIALGA",
+      "species": "DIALGA",
       "hp": 100,
       "atk": 120,
       "def": 120,
@@ -38245,10 +38245,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 0,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -38315,7 +38315,7 @@
       ]
     },
     {
-      "species": "SPECIES_PALKIA",
+      "species": "PALKIA",
       "hp": 90,
       "atk": 120,
       "def": 100,
@@ -38338,10 +38338,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 0,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -38411,7 +38411,7 @@
       ]
     },
     {
-      "species": "SPECIES_HEATRAN",
+      "species": "HEATRAN",
       "hp": 91,
       "atk": 90,
       "def": 106,
@@ -38434,10 +38434,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 127,
+      "genderRatio": 0.5,
       "eggCycles": 10,
       "friendship": 100,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -38496,7 +38496,7 @@
       ]
     },
     {
-      "species": "SPECIES_REGIGIGAS",
+      "species": "REGIGIGAS",
       "hp": 110,
       "atk": 160,
       "def": 110,
@@ -38519,10 +38519,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 0,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -38577,7 +38577,7 @@
       ]
     },
     {
-      "species": "SPECIES_GIRATINA",
+      "species": "GIRATINA",
       "hp": 150,
       "atk": 100,
       "def": 120,
@@ -38600,10 +38600,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 0,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -38670,7 +38670,7 @@
       ]
     },
     {
-      "species": "SPECIES_CRESSELIA",
+      "species": "CRESSELIA",
       "hp": 120,
       "atk": 70,
       "def": 120,
@@ -38693,10 +38693,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 254,
+      "genderRatio": 1.0,
       "eggCycles": 120,
       "friendship": 100,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -38751,7 +38751,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_PHIONE",
+      "species": "PHIONE",
       "hp": 80,
       "atk": 80,
       "def": 80,
@@ -38774,10 +38774,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 40,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FAIRY"
@@ -38822,7 +38822,7 @@
       ]
     },
     {
-      "species": "SPECIES_MANAPHY",
+      "species": "MANAPHY",
       "hp": 100,
       "atk": 100,
       "def": 100,
@@ -38845,10 +38845,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 10,
       "friendship": 70,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_WATER_1",
         "EGG_GROUP_FAIRY"
@@ -38903,7 +38903,7 @@
       ]
     },
     {
-      "species": "SPECIES_DARKRAI",
+      "species": "DARKRAI",
       "hp": 70,
       "atk": 90,
       "def": 90,
@@ -38926,10 +38926,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 0,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -39003,7 +39003,7 @@
       ]
     },
     {
-      "species": "SPECIES_SHAYMIN",
+      "species": "SHAYMIN",
       "hp": 100,
       "atk": 100,
       "def": 100,
@@ -39026,10 +39026,10 @@
         "ITEM_LUM_BERRY",
         "ITEM_LUM_BERRY"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 100,
-      "growthRate": 3,
+      "growthRate": "MEDIUM_SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -39073,7 +39073,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_ARCEUS",
+      "species": "ARCEUS",
       "hp": 120,
       "atk": 120,
       "def": 120,
@@ -39096,10 +39096,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 0,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -39196,7 +39196,7 @@
       ]
     },
     {
-      "species": "SPECIES_EGG",
+      "species": "EGG",
       "hp": 10,
       "atk": 10,
       "def": 10,
@@ -39219,10 +39219,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 0,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -39238,7 +39238,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_MANAPHY_EGG",
+      "species": "MANAPHY_EGG",
       "hp": 10,
       "atk": 10,
       "def": 10,
@@ -39261,10 +39261,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 0,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -39280,7 +39280,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_DEOXYS_ATK",
+      "species": "DEOXYS_ATK",
       "hp": 50,
       "atk": 180,
       "def": 20,
@@ -39303,10 +39303,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 0,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -39382,7 +39382,7 @@
       ]
     },
     {
-      "species": "SPECIES_DEOXYS_DEF",
+      "species": "DEOXYS_DEF",
       "hp": 50,
       "atk": 70,
       "def": 160,
@@ -39405,10 +39405,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 0,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -39484,7 +39484,7 @@
       ]
     },
     {
-      "species": "SPECIES_DEOXYS_SPD",
+      "species": "DEOXYS_SPD",
       "hp": 50,
       "atk": 95,
       "def": 90,
@@ -39507,10 +39507,10 @@
         "ITEM_NONE",
         "ITEM_NONE"
       ],
-      "genderRatio": 255,
+      "genderRatio": 2,
       "eggCycles": 120,
       "friendship": 0,
-      "growthRate": 5,
+      "growthRate": "SLOW",
       "eggGroups": [
         "EGG_GROUP_UNDISCOVERED",
         "EGG_GROUP_UNDISCOVERED"
@@ -39586,7 +39586,7 @@
       ]
     },
     {
-      "species": "SPECIES_WORMADAM_SANDY",
+      "species": "WORMADAM_SANDY",
       "hp": 60,
       "atk": 79,
       "def": 105,
@@ -39609,10 +39609,10 @@
         "ITEM_NONE",
         "ITEM_SILVERPOWDER"
       ],
-      "genderRatio": 254,
+      "genderRatio": 1.0,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
@@ -39661,7 +39661,7 @@
       "hms": []
     },
     {
-      "species": "SPECIES_WORMADAM_TRASH",
+      "species": "WORMADAM_TRASH",
       "hp": 60,
       "atk": 69,
       "def": 95,
@@ -39684,10 +39684,10 @@
         "ITEM_NONE",
         "ITEM_SILVERPOWDER"
       ],
-      "genderRatio": 254,
+      "genderRatio": 1.0,
       "eggCycles": 15,
       "friendship": 70,
-      "growthRate": 0,
+      "growthRate": "MEDIUM_FAST",
       "eggGroups": [
         "EGG_GROUP_BUG",
         "EGG_GROUP_BUG"
diff --git a/files/poketool/personal/personal.json.txt b/files/poketool/personal/personal.json.txt
index c8af78ac..8a4d7d07 100644
--- a/files/poketool/personal/personal.json.txt
+++ b/files/poketool/personal/personal.json.txt
@@ -35,10 +35,10 @@ const struct BaseStats __data[] = {
 		// Items
         {{ mon.items.0 }},
         {{ mon.items.1 }},
-        {{ mon.genderRatio }}, // Gender ratio
+        GENDER_RATIO({{ mon.genderRatio }}), // Gender ratio
         {{ mon.eggCycles }}, // Egg cycles
         {{ mon.friendship }}, // Friendship
-        {{ mon.growthRate }}, // Growth rate
+        GROWTH_{{ mon.growthRate }}, // Growth rate
         // Egg groups
         { {{ mon.eggGroups.0 }}, {{ mon.eggGroups.1 }} },
         // Abilities
diff --git a/include/constants/items.h b/include/constants/items.h
index 433532a4..a7fcc32f 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -128,7 +128,9 @@
 #define ITEM_AIR_MAIL            146
 #define ITEM_MOSAIC_MAIL         147
 #define ITEM_BRICK_MAIL          148
+
 #define ITEM_CHERI_BERRY         149
+#define FIRST_BERRY_IDX ITEM_CHERI_BERRY
 #define ITEM_CHESTO_BERRY        150
 #define ITEM_PECHA_BERRY         151
 #define ITEM_RAWST_BERRY         152
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index 5c8c32d4..1af59830 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -269,9 +269,15 @@
 #define MON_DATA_SPECIES_NAME       178
 
 #define MON_RATIO_MALE           0
+#define MON_RATIO_EIGHTH        31
+#define MON_RATIO_QUARTER       63
+#define MON_RATIO_HALF         127
+#define MON_RATIO_THREEQUARTER 191
 #define MON_RATIO_FEMALE       254
 #define MON_RATIO_UNKNOWN      255
 
+#define GENDER_RATIO(frac) ( (frac) <= 1 ? (u8)((frac) * 254.75) : 255 )
+
 enum MonGender
 {
     MON_MALE = 0,
@@ -435,4 +441,14 @@ typedef enum EvoMethod
     EVO_ROUTE217,
 } EvoMethod;
 
+enum GrowthRate
+{
+    GROWTH_MEDIUM_FAST = 0,
+    GROWTH_ERRATIC,
+    GROWTH_FLUCTUATING,
+    GROWTH_MEDIUM_SLOW,
+    GROWTH_FAST,
+    GROWTH_SLOW,
+};
+
 #endif //POKEDIAMOND_CONSTANTS_POKEMON_H
diff --git a/include/itemtool.h b/include/itemtool.h
new file mode 100644
index 00000000..525e68f9
--- /dev/null
+++ b/include/itemtool.h
@@ -0,0 +1,24 @@
+#ifndef POKEDIAMOND_ITEMTOOL_H
+#define POKEDIAMOND_ITEMTOOL_H
+
+#include "global.h"
+#include "constants/items.h"
+
+// Berries (nutdata)
+
+struct NutData
+{
+    u16 unk0;
+    u8 unk2;
+    u8 unk3;
+    u8 unk4;
+    u8 unk5;
+    u8 unk6;
+    u8 unk7;
+    u8 unk8;
+    u8 unk9;
+    u8 unkA;
+    u8 unkB;
+};
+
+#endif //POKEDIAMOND_ITEMTOOL_H
diff --git a/include/move_data.h b/include/move_data.h
index 5267bfb1..a970e1bf 100644
--- a/include/move_data.h
+++ b/include/move_data.h
@@ -3,24 +3,39 @@
 
 struct WazaTbl
 {
-    u16 unk0;
+    u16 effect;
     u8 unk2;
-    u8 unk3;
-    u8 unk4;
-    u8 unk5;
+    u8 power;
+    u8 type;
+    u8 accuracy;
     u8 pp;
-    u8 unk7;
+    u8 effectChance;
     u16 unk8;
-    s8 unkA;
+    s8 priority;
     u8 unkB;
     u8 unkC;
-    u8 unkD;
+    u8 contestType;
     u8 padding[2];
 };
 
+typedef enum MoveAttr {
+    MOVEATTR_EFFECT = 0,
+    MOVEATTR_UNK1,
+    MOVEATTR_POWER,
+    MOVEATTR_TYPE,
+    MOVEATTR_ACCURACY,
+    MOVEATTR_PP,
+    MOVEATTR_EFFECT_CHANCE,
+    MOVEATTR_UNK7,
+    MOVEATTR_PRIORTY,
+    MOVEATTR_UNK9,
+    MOVEATTR_UNK10,
+    MOVEATTR_CONTEST_TYPE,
+} MoveAttr;
+
 void LoadAllWazaTbl(struct WazaTbl * dest);
 u8 WazaGetMaxPp(u16 move, u8 ppUp);
-u32 GetWazaAttr(u16 move, u32 attr);
-u32 GetAttrFromWazaTbl(struct WazaTbl * wazaTbl, u32 attr);
+u32 GetWazaAttr(u16 move, MoveAttr attr);
+u32 GetAttrFromWazaTbl(struct WazaTbl * wazaTbl, MoveAttr attr);
 
 #endif //POKEDIAMOND_MOVE_DATA_H
diff --git a/include/msg_data.h b/include/msg_data.h
new file mode 100644
index 00000000..debacc79
--- /dev/null
+++ b/include/msg_data.h
@@ -0,0 +1,20 @@
+#ifndef POKEDIAMOND_MSG_DATA_H
+#define POKEDIAMOND_MSG_DATA_H
+
+struct MsgData
+{
+    u16 unk0;
+    u16 unk2;
+    u16 unk4;
+    u16 unk6;
+    union {
+        u16 * raw;
+        NARC * narc;
+    } data;
+};
+
+struct MsgData * NewMsgDataFromNarc(u32 type, u32 narcId, u32 msgId, u32 heapno);
+u16 * FUN_0200A914(struct MsgData *, u32);
+void DestroyMsgData(struct MsgData *);
+
+#endif //POKEDIAMOND_MSG_DATA_H
diff --git a/include/nitro/OS_alarm_shared.h b/include/nitro/OS_alarm_shared.h
new file mode 100644
index 00000000..fe549351
--- /dev/null
+++ b/include/nitro/OS_alarm_shared.h
@@ -0,0 +1,35 @@
+/*
+ * NOTE:
+ * This file is shared between ARM9 and ARM7
+ * DO NOT PUT PROC SPECIFIC CODE IN HERE
+ * Thank You!
+ */
+
+/*
+ * DO NOT INCLUDE THIS FILE DIRECTLY
+ * Include OS_alarm.h from the specific proc's lib
+ */
+
+#ifndef POKEDIAMOND_OS_ALARM_SHARED_H
+#define POKEDIAMOND_OS_ALARM_SHARED_H
+
+#include "nitro/types.h"
+#include "nitro/OS_tick_shared.h"
+
+typedef void (*OSAlarmHandler) (void *);
+
+struct OSiAlarm
+{
+    OSAlarmHandler handler;
+    void *arg;
+
+    u32 tag;
+    OSTick fire;
+    OSAlarm *prev;
+    OSAlarm *next;
+
+    OSTick period;
+    OSTick start;
+};
+
+#endif //POKEDIAMOND_OS_ALARM_SHARED_H
diff --git a/include/nitro/OS_mutex_shared.h b/include/nitro/OS_mutex_shared.h
new file mode 100644
index 00000000..e3c93e47
--- /dev/null
+++ b/include/nitro/OS_mutex_shared.h
@@ -0,0 +1,26 @@
+/*
+ * NOTE:
+ * This file is shared between ARM9 and ARM7
+ * DO NOT PUT PROC SPECIFIC CODE IN HERE
+ * Thank You!
+ */
+
+/*
+ * DO NOT INCLUDE THIS FILE DIRECTLY
+ * Include OS_mutex.h from the specific proc's lib
+ */
+
+#ifndef POKEDIAMOND_OS_MUTEX_SHARED_H
+#define POKEDIAMOND_OS_MUTEX_SHARED_H
+
+#include "nitro/OS_thread_shared.h"
+#include "nitro/types.h"
+
+struct OSMutex {
+    OSThreadQueue queue;
+    OSThread *thread;
+    s32 count;
+    OSMutexLink link;
+};
+
+#endif //POKEDIAMOND_OS_MUTEX_SHARED_H
diff --git a/include/nitro/OS_systemWork_shared.h b/include/nitro/OS_systemWork_shared.h
new file mode 100644
index 00000000..54321015
--- /dev/null
+++ b/include/nitro/OS_systemWork_shared.h
@@ -0,0 +1,66 @@
+/*
+ * NOTE:
+ * This file is shared between ARM9 and ARM7
+ * DO NOT PUT PROC SPECIFIC CODE IN HERE
+ * Thank You!
+ */
+
+/*
+ * DO NOT INCLUDE THIS FILE DIRECTLY
+ * Include consts.h from the specific proc's lib
+ */
+
+#ifndef POKEDIAMOND_OS_SYSTEMWORK_SHARED_H
+#define POKEDIAMOND_OS_SYSTEMWORK_SHARED_H
+
+#include "nitro/types.h"
+#include "nitro/mmap_shared.h"
+#include "nitro/OS_thread_shared.h"
+#include "nitro/OS_spinLock_shared.h"
+
+typedef struct {
+    u8      bootCheckInfo[0x20];       // 000-01f:   32byte boot check info
+    u32     resetParameter;            // 020-023:    4byte reset parameter
+    u8      padding5[0x8];             // 024-02c:  (8byte)
+    u32     romBaseOffset;             // 02c-02f:    4byte ROM offset of own program
+    u8      cartridgeModuleInfo[12];   // 030-03b:   12byte cartridge module info
+    u32     vblankCount;               // 03c-03f:    4byte V-Blank Count
+    u8      wmBootBuf[0x40];           // 040-07f:   64byte WM multiboot buffer
+    u8      nvramUserInfo[0x100];      // 080-17f: 256bytes NVRAM user info
+    u8      isd_reserved1[0x20];       // 180-19f:  32bytes ISDebugger reserved
+    u8      arenaInfo[0x48];           // 1a0-1e7:  72byte Arena information
+    u8      real_time_clock[8];        // 1e8-1ef:   8bytes RTC
+    u32     dmaClearBuf[4];            // 1f0-1ff:  16bytes DMA clear information buffer (for ARM9-TEG)
+    u8      rom_header[0x160];         // 200-35f: 352bytes ROM registration area info storage buffer
+    u8      isd_reserved2[32];         // 360-37f:  32bytes ISDebugger reserved
+    u32     pxiSignalParam[2];         // 380-387:   8bytes Param for PXI Signal
+    u32     pxiHandleChecker[2];       // 388-38f:   8bytes Flag  for PXI Command Handler Installed
+    u32     mic_last_address;          // 390-393:   4bytes MIC latest sampling result storage address
+    u16     mic_sampling_data;         // 394-395:   2bytes MIC sampling result
+    u16     wm_callback_control;       // 396-397:   2bytes Parameter for WM callback synchronization
+    u16     wm_rssi_pool;              // 398-399:   2bytes Random number source depends on WM received signal intensity
+    u8      padding3[2];               // 39a-39b: (2bytes)
+    u32     component_param;           // 39c-39f:   4bytes Parameter for Component synchronization
+    OSThreadInfo *threadinfo_mainp;    // 3a0-3a3:   4bytes Verify that the pointer to ARM9 thread information is initial value 0
+    OSThreadInfo *threadinfo_subp;     // 3a4-3a7:   4bytes Verify that the pointer to ARM7 thread information is initial value 0
+    u16     button_XY;                 // 3a8-3a9:   2bytes XY button information storage location
+    u8      touch_panel[4];            // 3aa-3ad:   4bytes Touch Screen information storage location
+    u16     autoloadSync;              // 3ae-3af:   2bytes autoload sync between processors
+    u32     lockIDFlag_mainp[2];       // 3b0-3b7:   8bytes lockID management flag (ARM9)
+    u32     lockIDFlag_subp[2];        // 3b8-3bf:   8bytes lockID management flag (ARM7)
+    struct OSLockWord lock_VRAM_C;     // 3c0-3c7:   8bytes           C - lock buffer
+    struct OSLockWord lock_VRAM_D;     // 3c8-3cf:   8bytes VRAM-D - lock buffer
+    struct OSLockWord lock_WRAM_BLOCK0; // 3d0-3d7:   8bytes   Block0 - lock buffer
+    struct OSLockWord lock_WRAM_BLOCK1; // 3d8-3df:   8bytes CPU internal work RAM - Block1 - lock buffer
+    struct OSLockWord lock_CARD;       // 3e0-3e7:   8bytes Game Card - lock buffer
+    struct OSLockWord lock_CARTRIDGE;  // 3e8-3ef:   8bytes DS Pak - lock buffer
+    struct OSLockWord lock_INIT;       // 3f0-3f7:   8bytes Initialization lock buffer
+    u16     mmem_checker_mainp;        // 3f8-3f9:   2bytes MainMomory Size Checker for Main processor
+    u16     mmem_checker_subp;         // 3fa-3fb:   2bytes MainMomory Size Checker for Sub processor
+    u8      padding4[2];               // 3fc-3fd: (2bytes)
+    u16     command_area;              // 3fe-3ff:   2bytes Command Area
+} OSSystemWork; //0x027FFC00
+
+#define OS_GetSystemWork()      ((OSSystemWork *)HW_MAIN_MEM_SYSTEM)
+
+#endif //POKEDIAMOND_OS_SYSTEMWORK_SHARED_H
diff --git a/include/nitro/OS_thread_shared.h b/include/nitro/OS_thread_shared.h
index 28d8a503..a0cce54d 100644
--- a/include/nitro/OS_thread_shared.h
+++ b/include/nitro/OS_thread_shared.h
@@ -1,3 +1,15 @@
+/*
+ * NOTE:
+ * This file is shared between ARM9 and ARM7
+ * DO NOT PUT PROC SPECIFIC CODE IN HERE
+ * Thank You!
+ */
+
+/*
+ * DO NOT INCLUDE THIS FILE DIRECTLY
+ * Include OS_thread.h from the specific proc's lib
+ */
+
 #ifndef POKEDIAMOND_OS_THREAD_SHARED_H
 #define POKEDIAMOND_OS_THREAD_SHARED_H
 
diff --git a/include/nitro/OS_tick_shared.h b/include/nitro/OS_tick_shared.h
new file mode 100644
index 00000000..e6d6d3b3
--- /dev/null
+++ b/include/nitro/OS_tick_shared.h
@@ -0,0 +1,24 @@
+/*
+ * NOTE:
+ * This file is shared between ARM9 and ARM7
+ * DO NOT PUT PROC SPECIFIC CODE IN HERE
+ * Thank You!
+ */
+
+/*
+ * DO NOT INCLUDE THIS FILE DIRECTLY
+ * Include OS_tick.h from the specific proc's lib
+ */
+
+#ifndef POKEDIAMOND_OS_TICK_SHARED_H
+#define POKEDIAMOND_OS_TICK_SHARED_H
+
+#include "nitro/types.h"
+
+typedef u64 OSTick;
+
+#define OS_SYSTEM_CLOCK HW_SYSTEM_CLOCK
+
+#define OS_MilliSecondsToTicks(msec) ((OSTick)(((OS_SYSTEM_CLOCK/1000) * (u64)(msec)) / 64))
+
+#endif //POKEDIAMOND_OS_TICK_SHARED_H
diff --git a/include/nitro/consts_shared.h b/include/nitro/consts_shared.h
index b6342172..26cc2fca 100644
--- a/include/nitro/consts_shared.h
+++ b/include/nitro/consts_shared.h
@@ -30,6 +30,14 @@
 #define OSi_InRange(targ, a, b)    ((u32)(a) <= (u32)(targ) && (u32)(targ) < (u32)(b))
 #define OSi_OFFSET(n, a)           (((u32) (n)) & ((a) - 1))
 
+#define OS_THREAD_SPECIFIC_MAX     0x03
+
+#define OS_THREAD_LAUNCHER_PRIORITY 0x10
+#define OS_THREAD_PRIORITY_MIN     0x00
+#define OS_THREAD_PRIORITY_MAX     0x1F
+
+#define HW_SYSTEM_CLOCK            33514000
+
 #define OSi_GetArenaInfo()         (*(OSArenaInfo*)HW_ARENA_INFO_BUF)
 
 #endif //POKEDIAMOND_CONSTS_SHARED_H
diff --git a/include/nitro/mmap_shared.h b/include/nitro/mmap_shared.h
index f7ba4fb4..60c0c1cb 100644
--- a/include/nitro/mmap_shared.h
+++ b/include/nitro/mmap_shared.h
@@ -18,6 +18,9 @@
 #define HW_MAIN_MEM_MAIN_SIZE   0x003E0000
 #define HW_MAIN_MEM_SHARED_SIZE 0x00001000
 
+#define HW_WRAM                 0x037F8000
+
+#define HW_MAIN_MEM_SYSTEM      (HW_MAIN_MEM + 0x007ffc00)
 #define HW_WM_BOOT_BUF          (HW_MAIN_MEM + 0x007ffc40)
 #define HW_ARENA_INFO_BUF       (HW_MAIN_MEM + 0x007ffda0)
 #define HW_CTRDG_LOCK_BUF       (HW_MAIN_MEM + 0x007fffe8)
diff --git a/tools/csv2bin/Makefile b/tools/csv2bin/Makefile
index 949ec4e4..818e6579 100644
--- a/tools/csv2bin/Makefile
+++ b/tools/csv2bin/Makefile
@@ -1,19 +1,13 @@
 CC = gcc
 CFLAGS = -O3
 
-growth_rates_txt = $(wildcard *.txt)
-growth_rates_bin = $(growth_rates_txt:%.txt=%.bin)
-
 .PHONY: all clean
 
 all: csv2bin $(growth_rates_bin)
 	@:
 
 clean:
-	$(RM) csv2bin $(growth_rates_bin)
+	$(RM) csv2bin
 
 csv2bin: csv2bin.c
 	$(CC) $(CFLAGS) -o $@ $^
-
-%.bin: %.txt
-	./csv2bin $<