87 files changed, 2283 insertions, 2870 deletions

diff --git a/arm9/asm/pokedex.s b/arm9/asm/pokedex.s
deleted file mode 100644
index 11a29cda..00000000
--- a/arm9/asm/pokedex.s
+++ /dev/null
@@ -1,2373 +0,0 @@
-	.include "asm/macros.inc"
-    .include "global.inc"
-    .include "constants/species.h"
-
-	.section .rodata
-
-	.global UNK_020EE940
-UNK_020EE940: ; 0x020EE940
-	.short SPECIES_MANAPHY
-	.short SPECIES_MEW
-	.short SPECIES_LUGIA
-	.short SPECIES_HO_OH
-	.short SPECIES_CELEBI
-	.short SPECIES_JIRACHI
-	.short SPECIES_DEOXYS
-	.short SPECIES_PHIONE
-	.short SPECIES_MANAPHY
-	.short SPECIES_DARKRAI
-	.short SPECIES_SHAYMIN
-	.short SPECIES_ARCEUS
-
-	.text
-
-	thumb_func_start Sav2_Pokedex_sizeof
-Sav2_Pokedex_sizeof: ; 0x02023D64
-	mov r0, #0x4f
-	lsl r0, r0, #0x2
-	bx lr
-	.balign 4
-
-	thumb_func_start Sav2_Pokedex_new
-Sav2_Pokedex_new: ; 0x02023D6C
-	push {r4, lr}
-	mov r1, #0x4f
-	lsl r1, r1, #0x2
-	bl AllocFromHeap
-	add r4, r0, #0x0
-	bl Sav2_Pokedex_init
-	add r0, r4, #0x0
-	pop {r4, pc}
-
-	thumb_func_start Sav2_Pokedex_Copy
-Sav2_Pokedex_Copy: ; 0x02023D80
-	ldr r3, _02023D88 ; =MI_CpuCopy8
-	mov r2, #0x4f
-	lsl r2, r2, #0x2
-	bx r3
-	.balign 4
-_02023D88: .word MI_CpuCopy8
-
-	thumb_func_start FUN_02023D8C
-FUN_02023D8C: ; 0x02023D8C
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	ldr r0, _02023DE8 ; =0x000001A6
-	add r4, r1, #0x0
-	cmp r4, r0
-	beq _02023DA2
-	add r0, r0, #0x1
-	cmp r4, r0
-	beq _02023DA2
-	bl ErrorHandling
-_02023DA2:
-	lsl r1, r4, #0x10
-	add r0, r5, #0x0
-	lsr r1, r1, #0x10
-	bl FUN_020245F0
-	cmp r0, #0x0
-	bne _02023DB4
-	mov r0, #0x0
-	pop {r3-r5, pc}
-_02023DB4:
-	ldr r0, _02023DE8 ; =0x000001A6
-	cmp r4, r0
-	bne _02023DBE
-	sub r0, #0x9e
-	b _02023DC0
-_02023DBE:
-	sub r0, #0x9d
-_02023DC0:
-	add r0, r5, r0
-	ldrb r1, [r0, #0x0]
-	mov r2, #0x1
-	add r0, r1, #0x0
-	tst r0, r2
-	bne _02023DCE
-	mov r2, #0x0
-_02023DCE:
-	mov r0, #0x2
-	tst r0, r1
-	beq _02023DD8
-	mov r0, #0x1
-	b _02023DDA
-_02023DD8:
-	mov r0, #0x0
-_02023DDA:
-	cmp r2, r0
-	bne _02023DE2
-	mov r0, #0x1
-	pop {r3-r5, pc}
-_02023DE2:
-	mov r0, #0x2
-	pop {r3-r5, pc}
-	nop
-_02023DE8: .word 0x000001A6
-
-	thumb_func_start FUN_02023DEC
-FUN_02023DEC: ; 0x02023DEC
-	push {r3-r7, lr}
-	add r7, r0, #0x0
-	ldr r0, _02023E6C ; =0x000001A6
-	add r6, r1, #0x0
-	add r5, r2, #0x0
-	cmp r6, r0
-	beq _02023E04
-	add r0, r0, #0x1
-	cmp r6, r0
-	beq _02023E04
-	bl ErrorHandling
-_02023E04:
-	lsl r1, r6, #0x10
-	add r0, r7, #0x0
-	lsr r1, r1, #0x10
-	bl FUN_020245F0
-	cmp r0, #0x0
-	bne _02023E16
-	mov r0, #0x0
-	pop {r3-r7, pc}
-_02023E16:
-	ldr r0, _02023E6C ; =0x000001A6
-	cmp r6, r0
-	bne _02023E20
-	sub r0, #0x9e
-	b _02023E22
-_02023E20:
-	sub r0, #0x9d
-_02023E22:
-	add r4, r7, r0
-	add r0, r7, #0x0
-	add r1, r6, #0x0
-	bl FUN_02023D8C
-	mov r6, #0x0
-	cmp r0, #0x0
-	bls _02023E66
-	mov r1, #0x1
-_02023E34:
-	add r2, r6, #0x1
-	lsl r2, r2, #0x10
-	lsr r2, r2, #0x10
-	sub r2, r2, #0x1
-	lsl r2, r2, #0x10
-	lsr r3, r2, #0x10
-	add r7, r3, #0x0
-	mov r2, #0x7
-	asr r3, r3, #0x3
-	and r7, r2
-	add r2, r1, #0x0
-	ldrb r3, [r4, r3]
-	lsl r2, r7
-	tst r2, r3
-	beq _02023E56
-	add r2, r1, #0x0
-	b _02023E58
-_02023E56:
-	mov r2, #0x0
-_02023E58:
-	cmp r2, r5
-	bne _02023E60
-	mov r0, #0x1
-	pop {r3-r7, pc}
-_02023E60:
-	add r6, r6, #0x1
-	cmp r6, r0
-	blo _02023E34
-_02023E66:
-	mov r0, #0x0
-	pop {r3-r7, pc}
-	nop
-_02023E6C: .word 0x000001A6
-
-	thumb_func_start FUN_02023E70
-FUN_02023E70: ; 0x02023E70
-	push {r3-r7, lr}
-	add r6, r0, #0x0
-	ldr r0, _02023F28 ; =0x000001A6
-	add r5, r1, #0x0
-	add r7, r2, #0x0
-	cmp r5, r0
-	beq _02023E88
-	add r0, r0, #0x1
-	cmp r5, r0
-	beq _02023E88
-	bl ErrorHandling
-_02023E88:
-	lsl r2, r7, #0x18
-	add r0, r6, #0x0
-	add r1, r5, #0x0
-	lsr r2, r2, #0x18
-	bl FUN_02023DEC
-	cmp r0, #0x0
-	bne _02023F26
-	ldr r0, _02023F28 ; =0x000001A6
-	cmp r5, r0
-	bne _02023EA2
-	sub r0, #0x9e
-	b _02023EA4
-_02023EA2:
-	sub r0, #0x9d
-_02023EA4:
-	add r4, r6, r0
-	add r0, r6, #0x0
-	add r1, r5, #0x0
-	bl FUN_02023D8C
-	add r5, r0, #0x0
-	cmp r5, #0x2
-	bge _02023F26
-	add r0, r5, #0x1
-	lsl r0, r0, #0x10
-	lsr r6, r0, #0x10
-	lsl r0, r7, #0x18
-	lsr r0, r0, #0x18
-	cmp r0, #0x2
-	blo _02023EC6
-	bl ErrorHandling
-_02023EC6:
-	sub r0, r6, #0x1
-	lsl r0, r0, #0x10
-	lsr r1, r0, #0x10
-	add r2, r1, #0x0
-	mov r0, #0x7
-	and r2, r0
-	asr r1, r1, #0x3
-	mov r3, #0x1
-	lsl r3, r2
-	ldrb r0, [r4, r1]
-	mvn r3, r3
-	and r0, r3
-	strb r0, [r4, r1]
-	lsl r0, r7, #0x18
-	lsr r6, r0, #0x18
-	add r0, r6, #0x0
-	ldrb r3, [r4, r1]
-	lsl r0, r2
-	orr r0, r3
-	strb r0, [r4, r1]
-	cmp r5, #0x0
-	bne _02023F26
-	add r0, r5, #0x2
-	lsl r0, r0, #0x10
-	lsr r5, r0, #0x10
-	cmp r6, #0x2
-	blo _02023F00
-	bl ErrorHandling
-_02023F00:
-	sub r0, r5, #0x1
-	lsl r0, r0, #0x10
-	lsr r2, r0, #0x10
-	mov r0, #0x7
-	add r1, r2, #0x0
-	and r1, r0
-	asr r0, r2, #0x3
-	mov r2, #0x1
-	lsl r2, r1
-	ldrb r3, [r4, r0]
-	mvn r2, r2
-	and r2, r3
-	strb r2, [r4, r0]
-	add r2, r6, #0x0
-	ldrb r3, [r4, r0]
-	lsl r2, r1
-	add r1, r3, #0x0
-	orr r1, r2
-	strb r1, [r4, r0]
-_02023F26:
-	pop {r3-r7, pc}
-	.balign 4
-_02023F28: .word 0x000001A6
-
-	thumb_func_start FUN_02023F2C
-FUN_02023F2C: ; 0x02023F2C
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	mov r0, #0x67
-	add r4, r1, #0x0
-	lsl r0, r0, #0x2
-	cmp r4, r0
-	beq _02023F44
-	add r0, r0, #0x1
-	cmp r4, r0
-	beq _02023F44
-	bl ErrorHandling
-_02023F44:
-	lsl r1, r4, #0x10
-	add r0, r5, #0x0
-	lsr r1, r1, #0x10
-	bl FUN_020245F0
-	cmp r0, #0x0
-	bne _02023F56
-	mov r0, #0x0
-	pop {r3-r5, pc}
-_02023F56:
-	mov r0, #0x67
-	lsl r0, r0, #0x2
-	cmp r4, r0
-	bne _02023F62
-	sub r0, #0x92
-	b _02023F64
-_02023F62:
-	sub r0, #0x91
-_02023F64:
-	add r1, r5, r0
-	mov r0, #0x0
-	mov r3, #0x3
-_02023F6A:
-	lsl r2, r0, #0x10
-	lsr r5, r2, #0x10
-	asr r2, r5, #0x2
-	ldrb r4, [r1, r2]
-	lsl r2, r5, #0x1e
-	lsr r2, r2, #0x1d
-	asr r4, r2
-	add r2, r4, #0x0
-	and r2, r3
-	cmp r2, #0x3
-	beq _02023F86
-	add r0, r0, #0x1
-	cmp r0, #0x3
-	blt _02023F6A
-_02023F86:
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_02023F88
-FUN_02023F88: ; 0x02023F88
-	push {r4-r6, lr}
-	add r6, r0, #0x0
-	mov r0, #0x67
-	add r5, r1, #0x0
-	lsl r0, r0, #0x2
-	add r4, r2, #0x0
-	cmp r5, r0
-	beq _02023FA2
-	add r0, r0, #0x1
-	cmp r5, r0
-	beq _02023FA2
-	bl ErrorHandling
-_02023FA2:
-	lsl r1, r5, #0x10
-	add r0, r6, #0x0
-	lsr r1, r1, #0x10
-	bl FUN_020245F0
-	cmp r0, #0x0
-	bne _02023FB4
-	mov r0, #0x0
-	pop {r4-r6, pc}
-_02023FB4:
-	mov r0, #0x67
-	lsl r0, r0, #0x2
-	cmp r5, r0
-	bne _02023FC0
-	sub r0, #0x92
-	b _02023FC2
-_02023FC0:
-	sub r0, #0x91
-_02023FC2:
-	add r1, r6, r0
-	mov r0, #0x0
-	mov r3, #0x3
-_02023FC8:
-	lsl r2, r0, #0x10
-	lsr r6, r2, #0x10
-	asr r2, r6, #0x2
-	ldrb r5, [r1, r2]
-	lsl r2, r6, #0x1e
-	lsr r2, r2, #0x1d
-	asr r5, r2
-	add r2, r5, #0x0
-	and r2, r3
-	cmp r2, r4
-	bne _02023FE2
-	mov r0, #0x1
-	pop {r4-r6, pc}
-_02023FE2:
-	add r0, r0, #0x1
-	cmp r0, #0x3
-	blt _02023FC8
-	mov r0, #0x0
-	pop {r4-r6, pc}
-
-	thumb_func_start FUN_02023FEC
-FUN_02023FEC: ; 0x02023FEC
-	push {r3-r7, lr}
-	add r6, r0, #0x0
-	mov r0, #0x67
-	add r5, r1, #0x0
-	lsl r0, r0, #0x2
-	add r7, r2, #0x0
-	cmp r5, r0
-	beq _02024006
-	add r0, r0, #0x1
-	cmp r5, r0
-	beq _02024006
-	bl ErrorHandling
-_02024006:
-	lsl r2, r7, #0x18
-	add r0, r6, #0x0
-	add r1, r5, #0x0
-	lsr r2, r2, #0x18
-	bl FUN_02023F88
-	cmp r0, #0x0
-	bne _02024064
-	mov r0, #0x67
-	lsl r0, r0, #0x2
-	cmp r5, r0
-	bne _02024022
-	sub r0, #0x92
-	b _02024024
-_02024022:
-	sub r0, #0x91
-_02024024:
-	add r4, r6, r0
-	add r0, r6, #0x0
-	add r1, r5, #0x0
-	bl FUN_02023F2C
-	add r5, r0, #0x0
-	cmp r5, #0x3
-	bge _02024064
-	lsl r0, r7, #0x18
-	lsr r0, r0, #0x18
-	cmp r0, #0x4
-	blo _02024040
-	bl ErrorHandling
-_02024040:
-	lsl r0, r5, #0x10
-	lsr r2, r0, #0x10
-	lsl r0, r2, #0x1e
-	lsr r1, r0, #0x1d
-	asr r0, r2, #0x2
-	mov r2, #0x3
-	lsl r2, r1
-	ldrb r3, [r4, r0]
-	mvn r2, r2
-	and r2, r3
-	strb r2, [r4, r0]
-	lsl r2, r7, #0x18
-	lsr r2, r2, #0x18
-	ldrb r3, [r4, r0]
-	lsl r2, r1
-	add r1, r3, #0x0
-	orr r1, r2
-	strb r1, [r4, r0]
-_02024064:
-	pop {r3-r7, pc}
-	.balign 4
-
-	thumb_func_start FUN_02024068
-FUN_02024068: ; 0x02024068
-	push {r4-r6, lr}
-	add r6, r2, #0x0
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	cmp r6, #0x4
-	blo _02024078
-	bl ErrorHandling
-_02024078:
-	cmp r4, #0xf
-	bls _02024080
-	bl ErrorHandling
-_02024080:
-	cmp r6, #0x2
-	bhs _0202409E
-	lsl r0, r6, #0x2
-	add r0, #0x18
-	mov r1, #0xf
-	lsl r1, r0
-	ldr r2, [r5, #0x40]
-	mvn r1, r1
-	and r2, r1
-	add r1, r4, #0x0
-	lsl r1, r0
-	add r0, r2, #0x0
-	orr r0, r1
-	str r0, [r5, #0x40]
-	pop {r4-r6, pc}
-_0202409E:
-	sub r0, r6, #0x2
-	lsl r0, r0, #0x18
-	add r1, r5, #0x0
-	lsr r0, r0, #0x16
-	add r1, #0x80
-	ldr r2, [r1, #0x0]
-	add r0, #0x18
-	mov r1, #0xf
-	lsl r1, r0
-	mvn r1, r1
-	and r2, r1
-	add r1, r5, #0x0
-	add r1, #0x80
-	str r2, [r1, #0x0]
-	add r1, r5, #0x0
-	add r1, #0x80
-	ldr r2, [r1, #0x0]
-	add r1, r4, #0x0
-	lsl r1, r0
-	add r0, r2, #0x0
-	orr r0, r1
-	add r5, #0x80
-	str r0, [r5, #0x0]
-	pop {r4-r6, pc}
-	.balign 4
-
-	thumb_func_start FUN_020240D0
-FUN_020240D0: ; 0x020240D0
-	push {r3-r6}
-	mov r3, #0xf
-	mov r1, #0x0
-	add r4, r3, #0x0
-_020240D8:
-	lsl r2, r1, #0x18
-	lsr r6, r2, #0x18
-	cmp r6, #0x2
-	bhs _020240EE
-	lsl r2, r6, #0x2
-	ldr r5, [r0, #0x40]
-	add r2, #0x18
-	lsr r5, r2
-	add r2, r5, #0x0
-	and r2, r4
-	b _02024102
-_020240EE:
-	add r2, r0, #0x0
-	add r2, #0x80
-	ldr r5, [r2, #0x0]
-	sub r2, r6, #0x2
-	lsl r2, r2, #0x18
-	lsr r2, r2, #0x16
-	add r2, #0x18
-	lsr r5, r2
-	add r2, r5, #0x0
-	and r2, r3
-_02024102:
-	cmp r2, #0xf
-	beq _0202410C
-	add r1, r1, #0x1
-	cmp r1, #0x4
-	blt _020240D8
-_0202410C:
-	add r0, r1, #0x0
-	pop {r3-r6}
-	bx lr
-	.balign 4
-
-	thumb_func_start FUN_02024114
-FUN_02024114: ; 0x02024114
-	push {r4-r7}
-	mov r2, #0xf
-	mov r6, #0x0
-	add r3, r2, #0x0
-_0202411C:
-	lsl r4, r6, #0x18
-	lsr r5, r4, #0x18
-	cmp r5, #0x2
-	bhs _02024134
-	ldr r7, [r0, #0x40]
-	lsl r4, r5, #0x2
-	add r4, #0x18
-	add r5, r7, #0x0
-	lsr r5, r4
-	add r4, r5, #0x0
-	and r4, r3
-	b _02024146
-_02024134:
-	add r4, r0, #0x0
-	sub r5, r5, #0x2
-	add r4, #0x80
-	lsl r5, r5, #0x18
-	lsr r5, r5, #0x16
-	ldr r4, [r4, #0x0]
-	add r5, #0x18
-	lsr r4, r5
-	and r4, r2
-_02024146:
-	cmp r1, r4
-	bne _02024150
-	mov r0, #0x1
-	pop {r4-r7}
-	bx lr
-_02024150:
-	add r6, r6, #0x1
-	cmp r6, #0x4
-	blt _0202411C
-	mov r0, #0x0
-	pop {r4-r7}
-	bx lr
-
-	thumb_func_start FUN_0202415C
-FUN_0202415C: ; 0x0202415C
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	add r6, r1, #0x0
-	add r0, r2, #0x0
-	mov r1, #0x70
-	mov r2, #0x0
-	bl GetMonData
-	lsl r0, r0, #0x18
-	lsr r4, r0, #0x18
-	ldr r0, _02024198 ; =0x00000182
-	cmp r6, r0
-	bne _02024196
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl FUN_02024114
-	cmp r0, #0x0
-	bne _02024196
-	add r0, r5, #0x0
-	bl FUN_020240D0
-	add r2, r0, #0x0
-	lsl r2, r2, #0x18
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	lsr r2, r2, #0x18
-	bl FUN_02024068
-_02024196:
-	pop {r4-r6, pc}
-	.balign 4
-_02024198: .word 0x00000182
-
-	thumb_func_start FUN_0202419C
-FUN_0202419C: ; 0x0202419C
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	mov r4, #0x0
-	mov r6, #0xf
-_020241A4:
-	lsl r2, r4, #0x18
-	add r0, r5, #0x0
-	add r1, r6, #0x0
-	lsr r2, r2, #0x18
-	bl FUN_02024068
-	add r4, r4, #0x1
-	cmp r4, #0x4
-	blt _020241A4
-	pop {r4-r6, pc}
-
-	thumb_func_start FUN_020241B8
-FUN_020241B8: ; 0x020241B8
-	push {r4-r6, lr}
-	add r4, r1, #0x0
-	add r5, r0, #0x0
-	cmp r4, #0xc9
-	bne _02024210
-	add r0, r2, #0x0
-	bl GetMonUnownLetter
-	lsl r1, r0, #0x18
-	lsr r3, r1, #0x18
-	mov r1, #0x43
-	mov r4, #0x0
-	add r6, r5, #0x0
-	lsl r1, r1, #0x2
-_020241D4:
-	ldrb r2, [r6, r1]
-	cmp r3, r2
-	bne _020241DE
-	mov r1, #0x1
-	b _020241E8
-_020241DE:
-	add r4, r4, #0x1
-	add r6, r6, #0x1
-	cmp r4, #0x1c
-	blt _020241D4
-	mov r1, #0x0
-_020241E8:
-	cmp r1, #0x0
-	bne _02024290
-	mov r1, #0x43
-	mov r3, #0x0
-	add r4, r5, #0x0
-	lsl r1, r1, #0x2
-_020241F4:
-	ldrb r2, [r4, r1]
-	cmp r2, #0xff
-	beq _02024202
-	add r3, r3, #0x1
-	add r4, r4, #0x1
-	cmp r3, #0x1c
-	blt _020241F4
-_02024202:
-	cmp r3, #0x1c
-	bge _02024290
-	mov r1, #0x43
-	add r2, r5, r3
-	lsl r1, r1, #0x2
-	strb r0, [r2, r1]
-	pop {r4-r6, pc}
-_02024210:
-	mov r6, #0x67
-	lsl r6, r6, #0x2
-	cmp r4, r6
-	bne _0202422E
-	add r0, r2, #0x0
-	mov r1, #0x70
-	mov r2, #0x0
-	bl GetMonData
-	add r2, r0, #0x0
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl FUN_02023FEC
-	pop {r4-r6, pc}
-_0202422E:
-	add r3, r6, #0x1
-	cmp r4, r3
-	bne _0202424A
-	add r0, r2, #0x0
-	mov r1, #0x70
-	mov r2, #0x0
-	bl GetMonData
-	add r2, r0, #0x0
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl FUN_02023FEC
-	pop {r4-r6, pc}
-_0202424A:
-	add r3, r6, #0x0
-	add r3, #0xa
-	cmp r4, r3
-	bne _02024268
-	add r0, r2, #0x0
-	mov r1, #0x70
-	mov r2, #0x0
-	bl GetMonData
-	add r2, r0, #0x0
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl FUN_02023E70
-	pop {r4-r6, pc}
-_02024268:
-	add r3, r6, #0x0
-	add r3, #0xb
-	cmp r4, r3
-	bne _02024286
-	add r0, r2, #0x0
-	mov r1, #0x70
-	mov r2, #0x0
-	bl GetMonData
-	add r2, r0, #0x0
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl FUN_02023E70
-	pop {r4-r6, pc}
-_02024286:
-	sub r6, #0x1a
-	cmp r4, r6
-	bne _02024290
-	bl FUN_0202415C
-_02024290:
-	pop {r4-r6, pc}
-	.balign 4
-
-	thumb_func_start FUN_02024294
-FUN_02024294: ; 0x02024294
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	add r6, r2, #0x0
-	add r0, r1, #0x0
-	bl FUN_02087A50
-	add r4, r0, #0x0
-	add r0, r6, #0x0
-	bl FUN_02087A1C
-	cmp r4, #0xe
-	beq _020242C0
-	cmp r0, #0x6
-	beq _020242C0
-	ldr r1, _020242C4 ; =0x00000129
-	add r3, r5, r1
-	ldrb r2, [r3, r4]
-	mov r1, #0x1
-	lsl r1, r0
-	add r0, r2, #0x0
-	orr r0, r1
-	strb r0, [r3, r4]
-_020242C0:
-	pop {r4-r6, pc}
-	nop
-_020242C4: .word 0x00000129
-
-	thumb_func_start FUN_020242C8
-FUN_020242C8: ; 0x020242C8
-	push {r4-r6, lr}
-	add r6, r1, #0x0
-	add r5, r0, #0x0
-	add r0, r6, #0x0
-	mov r1, #0x12 ; BASE_GENDER_RATIO
-	add r4, r2, #0x0
-	bl GetMonBaseStat
-	cmp r0, #0xff
-	bne _020242EA
-	cmp r4, #0x0
-	bne _020242E4
-	mov r0, #0x2
-	pop {r4-r6, pc}
-_020242E4:
-	mov r0, #0x0
-	mvn r0, r0
-	pop {r4-r6, pc}
-_020242EA:
-	sub r0, r6, #0x1
-	lsl r0, r0, #0x10
-	lsr r2, r0, #0x10
-	mov r1, #0x1
-	mov r0, #0x7
-	add r3, r2, #0x0
-	and r3, r0
-	add r0, r1, #0x0
-	lsl r0, r3
-	asr r3, r2, #0x3
-	add r3, r5, r3
-	add r3, #0x84
-	ldrb r3, [r3, #0x0]
-	tst r0, r3
-	bne _0202430A
-	mov r1, #0x0
-_0202430A:
-	lsl r0, r1, #0x18
-	lsr r1, r0, #0x18
-	cmp r4, #0x1
-	bne _0202433A
-	add r4, r2, #0x0
-	asr r2, r2, #0x3
-	add r2, r5, r2
-	mov r0, #0x7
-	add r2, #0xc4
-	mov r3, #0x1
-	and r4, r0
-	add r0, r3, #0x0
-	ldrb r2, [r2, #0x0]
-	lsl r0, r4
-	tst r0, r2
-	bne _0202432C
-	mov r3, #0x0
-_0202432C:
-	lsl r0, r3, #0x18
-	lsr r0, r0, #0x18
-	cmp r0, r1
-	bne _0202433C
-	mov r0, #0x0
-	mvn r0, r0
-	pop {r4-r6, pc}
-_0202433A:
-	add r0, r1, #0x0
-_0202433C:
-	pop {r4-r6, pc}
-	.balign 4
-
-	thumb_func_start FUN_02024340
-FUN_02024340: ; 0x02024340
-	push {r4-r5}
-	mov r3, #0x0
-	ldr r5, _02024360 ; =UNK_020EE940 + 2
-	mov r4, #0x1
-	add r1, r3, #0x0
-_0202434A:
-	ldrh r2, [r5, #0x0]
-	cmp r0, r2
-	bne _02024352
-	add r4, r1, #0x0
-_02024352:
-	add r3, r3, #0x1
-	add r5, r5, #0x2
-	cmp r3, #0xb
-	blt _0202434A
-	add r0, r4, #0x0
-	pop {r4-r5}
-	bx lr
-	.balign 4
-_02024360: .word UNK_020EE940 + 2
-
-	thumb_func_start FUN_02024364
-FUN_02024364: ; 0x02024364
-	ldr r1, _02024374 ; =0x000001EA
-	mov r2, #0x1
-	cmp r0, r1
-	bne _0202436E
-	mov r2, #0x0
-_0202436E:
-	add r0, r2, #0x0
-	bx lr
-	nop
-_02024374: .word 0x000001EA
-
-	thumb_func_start Sav2_Pokedex_init
-Sav2_Pokedex_init: ; 0x02024378
-	push {r4, lr}
-	mov r2, #0x4f
-	mov r1, #0x0
-	lsl r2, r2, #0x2
-	add r4, r0, #0x0
-	bl memset
-	ldr r0, _020243C0 ; =0xBEEFCAFE
-	mov r1, #0x0
-	str r0, [r4, #0x0]
-	ldr r0, _020243C4 ; =0x00000139
-	mov r2, #0x1c
-	strb r1, [r4, r0]
-	sub r0, #0x2d
-	add r0, r4, r0
-	mov r1, #0xff
-	bl memset
-	mov r1, #0xff
-	add r0, r1, #0x0
-	add r0, #0x9
-	strb r1, [r4, r0]
-	add r0, r1, #0x0
-	add r0, #0xa
-	strb r1, [r4, r0]
-	add r0, r1, #0x0
-	add r0, #0xb
-	strb r1, [r4, r0]
-	add r0, r1, #0x0
-	add r0, #0xc
-	strb r1, [r4, r0]
-	add r0, r4, #0x0
-	bl FUN_0202419C
-	pop {r4, pc}
-	nop
-_020243C0: .word 0xBEEFCAFE
-_020243C4: .word 0x00000139
-
-	thumb_func_start FUN_020243C8
-FUN_020243C8: ; 0x020243C8
-	push {r3-r7, lr}
-	add r6, r0, #0x0
-	ldr r1, [r6, #0x0]
-	ldr r0, _020243FC ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _020243D8
-	bl ErrorHandling
-_020243D8:
-	ldr r7, _02024400 ; =0x000001ED
-	mov r5, #0x0
-	mov r4, #0x1
-_020243DE:
-	lsl r1, r4, #0x10
-	add r0, r6, #0x0
-	lsr r1, r1, #0x10
-	bl FUN_02024594
-	cmp r0, #0x1
-	bne _020243EE
-	add r5, r5, #0x1
-_020243EE:
-	add r4, r4, #0x1
-	cmp r4, r7
-	ble _020243DE
-	lsl r0, r5, #0x10
-	lsr r0, r0, #0x10
-	pop {r3-r7, pc}
-	nop
-_020243FC: .word 0xBEEFCAFE
-_02024400: .word 0x000001ED
-
-	thumb_func_start FUN_02024404
-FUN_02024404: ; 0x02024404
-	push {r3-r7, lr}
-	add r6, r0, #0x0
-	ldr r1, [r6, #0x0]
-	ldr r0, _02024438 ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _02024414
-	bl ErrorHandling
-_02024414:
-	ldr r7, _0202443C ; =0x000001ED
-	mov r5, #0x0
-	mov r4, #0x1
-_0202441A:
-	lsl r1, r4, #0x10
-	add r0, r6, #0x0
-	lsr r1, r1, #0x10
-	bl FUN_020245F0
-	cmp r0, #0x1
-	bne _0202442A
-	add r5, r5, #0x1
-_0202442A:
-	add r4, r4, #0x1
-	cmp r4, r7
-	ble _0202441A
-	lsl r0, r5, #0x10
-	lsr r0, r0, #0x10
-	pop {r3-r7, pc}
-	nop
-_02024438: .word 0xBEEFCAFE
-_0202443C: .word 0x000001ED
-
-	thumb_func_start FUN_02024440
-FUN_02024440: ; 0x02024440
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl Pokedex_GetNatDexFlag
-	cmp r0, #0x0
-	beq _02024454
-	add r0, r4, #0x0
-	bl FUN_02024404
-	pop {r4, pc}
-_02024454:
-	add r0, r4, #0x0
-	bl FUN_020244A4
-	pop {r4, pc}
-
-	thumb_func_start FUN_0202445C
-FUN_0202445C: ; 0x0202445C
-	push {r3-r7, lr}
-	add r6, r0, #0x0
-	ldr r1, [r6, #0x0]
-	ldr r0, _0202449C ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _0202446C
-	bl ErrorHandling
-_0202446C:
-	ldr r7, _020244A0 ; =0x000001ED
-	mov r5, #0x0
-	mov r4, #0x1
-_02024472:
-	lsl r1, r4, #0x10
-	add r0, r6, #0x0
-	lsr r1, r1, #0x10
-	bl FUN_02024594
-	cmp r0, #0x1
-	bne _0202448E
-	lsl r0, r4, #0x10
-	lsr r0, r0, #0x10
-	bl FUN_02069B40
-	cmp r0, #0x0
-	beq _0202448E
-	add r5, r5, #0x1
-_0202448E:
-	add r4, r4, #0x1
-	cmp r4, r7
-	ble _02024472
-	lsl r0, r5, #0x10
-	lsr r0, r0, #0x10
-	pop {r3-r7, pc}
-	nop
-_0202449C: .word 0xBEEFCAFE
-_020244A0: .word 0x000001ED
-
-	thumb_func_start FUN_020244A4
-FUN_020244A4: ; 0x020244A4
-	push {r3-r7, lr}
-	add r6, r0, #0x0
-	ldr r1, [r6, #0x0]
-	ldr r0, _020244E4 ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _020244B4
-	bl ErrorHandling
-_020244B4:
-	ldr r7, _020244E8 ; =0x000001ED
-	mov r5, #0x0
-	mov r4, #0x1
-_020244BA:
-	lsl r1, r4, #0x10
-	add r0, r6, #0x0
-	lsr r1, r1, #0x10
-	bl FUN_020245F0
-	cmp r0, #0x1
-	bne _020244D6
-	lsl r0, r4, #0x10
-	lsr r0, r0, #0x10
-	bl FUN_02069B40
-	cmp r0, #0x0
-	beq _020244D6
-	add r5, r5, #0x1
-_020244D6:
-	add r4, r4, #0x1
-	cmp r4, r7
-	ble _020244BA
-	lsl r0, r5, #0x10
-	lsr r0, r0, #0x10
-	pop {r3-r7, pc}
-	nop
-_020244E4: .word 0xBEEFCAFE
-_020244E8: .word 0x000001ED
-
-	thumb_func_start FUN_020244EC
-FUN_020244EC: ; 0x020244EC
-	push {r3, lr}
-	bl FUN_02024518
-	ldr r1, _02024500 ; =0x000001E2
-	cmp r0, r1
-	blo _020244FC
-	mov r0, #0x1
-	pop {r3, pc}
-_020244FC:
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-_02024500: .word 0x000001E2
-
-	thumb_func_start FUN_02024504
-FUN_02024504: ; 0x02024504
-	push {r3, lr}
-	bl FUN_02024550
-	cmp r0, #0x96
-	blo _02024512
-	mov r0, #0x1
-	pop {r3, pc}
-_02024512:
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_02024518
-FUN_02024518: ; 0x02024518
-	push {r3-r7, lr}
-	ldr r7, _0202454C ; =0x000001ED
-	add r6, r0, #0x0
-	mov r5, #0x0
-	mov r4, #0x1
-_02024522:
-	lsl r1, r4, #0x10
-	add r0, r6, #0x0
-	lsr r1, r1, #0x10
-	bl FUN_02024594
-	cmp r0, #0x1
-	bne _02024542
-	lsl r0, r4, #0x10
-	lsr r0, r0, #0x10
-	bl FUN_02024340
-	cmp r0, #0x1
-	bne _02024542
-	add r0, r5, #0x1
-	lsl r0, r0, #0x10
-	lsr r5, r0, #0x10
-_02024542:
-	add r4, r4, #0x1
-	cmp r4, r7
-	ble _02024522
-	add r0, r5, #0x0
-	pop {r3-r7, pc}
-	.balign 4
-_0202454C: .word 0x000001ED
-
-	thumb_func_start FUN_02024550
-FUN_02024550: ; 0x02024550
-	push {r3-r7, lr}
-	ldr r7, _02024590 ; =0x000001ED
-	add r6, r0, #0x0
-	mov r5, #0x0
-	mov r4, #0x1
-_0202455A:
-	lsl r1, r4, #0x10
-	add r0, r6, #0x0
-	lsr r1, r1, #0x10
-	bl FUN_020245F0
-	cmp r0, #0x1
-	bne _02024586
-	lsl r0, r4, #0x10
-	lsr r0, r0, #0x10
-	bl FUN_02069B40
-	cmp r0, #0x0
-	beq _02024586
-	lsl r0, r4, #0x10
-	lsr r0, r0, #0x10
-	bl FUN_02024364
-	cmp r0, #0x1
-	bne _02024586
-	add r0, r5, #0x1
-	lsl r0, r0, #0x10
-	lsr r5, r0, #0x10
-_02024586:
-	add r4, r4, #0x1
-	cmp r4, r7
-	ble _0202455A
-	add r0, r5, #0x0
-	pop {r3-r7, pc}
-	.balign 4
-_02024590: .word 0x000001ED
-
-	thumb_func_start FUN_02024594
-FUN_02024594: ; 0x02024594
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	ldr r1, [r5, #0x0]
-	ldr r0, _020245E8 ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _020245A6
-	bl ErrorHandling
-_020245A6:
-	cmp r4, #0x0
-	beq _020245B0
-	ldr r0, _020245EC ; =0x000001ED
-	cmp r4, r0
-	bls _020245B8
-_020245B0:
-	bl ErrorHandling
-	mov r0, #0x1
-	b _020245BA
-_020245B8:
-	mov r0, #0x0
-_020245BA:
-	cmp r0, #0x0
-	beq _020245C2
-	mov r0, #0x0
-	pop {r3-r5, pc}
-_020245C2:
-	sub r0, r4, #0x1
-	lsl r0, r0, #0x10
-	lsr r2, r0, #0x10
-	mov r0, #0x1
-	mov r1, #0x7
-	and r1, r2
-	add r3, r0, #0x0
-	lsl r3, r1
-	asr r1, r2, #0x3
-	add r2, r5, r1
-	ldrb r1, [r2, #0x4]
-	tst r1, r3
-	beq _020245E4
-	add r2, #0x44
-	ldrb r1, [r2, #0x0]
-	tst r1, r3
-	bne _020245E6
-_020245E4:
-	mov r0, #0x0
-_020245E6:
-	pop {r3-r5, pc}
-	.balign 4
-_020245E8: .word 0xBEEFCAFE
-_020245EC: .word 0x000001ED
-
-	thumb_func_start FUN_020245F0
-FUN_020245F0: ; 0x020245F0
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	ldr r1, [r5, #0x0]
-	ldr r0, _02024640 ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _02024602
-	bl ErrorHandling
-_02024602:
-	cmp r4, #0x0
-	beq _0202460C
-	ldr r0, _02024644 ; =0x000001ED
-	cmp r4, r0
-	bls _02024614
-_0202460C:
-	bl ErrorHandling
-	mov r0, #0x1
-	b _02024616
-_02024614:
-	mov r0, #0x0
-_02024616:
-	cmp r0, #0x0
-	beq _0202461E
-	mov r0, #0x0
-	pop {r3-r5, pc}
-_0202461E:
-	sub r0, r4, #0x1
-	lsl r0, r0, #0x10
-	lsr r3, r0, #0x10
-	mov r0, #0x1
-	mov r1, #0x7
-	and r1, r3
-	add r2, r0, #0x0
-	lsl r2, r1
-	asr r1, r3, #0x3
-	add r1, r5, r1
-	add r1, #0x44
-	ldrb r1, [r1, #0x0]
-	tst r1, r2
-	bne _0202463C
-	mov r0, #0x0
-_0202463C:
-	pop {r3-r5, pc}
-	nop
-_02024640: .word 0xBEEFCAFE
-_02024644: .word 0x000001ED
-
-	thumb_func_start FUN_02024648
-FUN_02024648: ; 0x02024648
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	ldr r1, [r5, #0x0]
-	ldr r0, _02024670 ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _0202465A
-	bl ErrorHandling
-_0202465A:
-	cmp r4, #0x0
-	bne _02024666
-	mov r0, #0x41
-	lsl r0, r0, #0x2
-	ldr r6, [r5, r0]
-	b _0202466A
-_02024666:
-	bl ErrorHandling
-_0202466A:
-	add r0, r6, #0x0
-	pop {r4-r6, pc}
-	nop
-_02024670: .word 0xBEEFCAFE
-
-	thumb_func_start FUN_02024674
-FUN_02024674: ; 0x02024674
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	ldr r1, [r5, #0x0]
-	ldr r0, _020246D4 ; =0xBEEFCAFE
-	add r6, r2, #0x0
-	cmp r1, r0
-	beq _02024688
-	bl ErrorHandling
-_02024688:
-	cmp r4, #0x0
-	beq _02024692
-	ldr r0, _020246D8 ; =0x000001ED
-	cmp r4, r0
-	bls _0202469A
-_02024692:
-	bl ErrorHandling
-	mov r0, #0x1
-	b _0202469C
-_0202469A:
-	mov r0, #0x0
-_0202469C:
-	cmp r0, #0x0
-	beq _020246A6
-	mov r0, #0x0
-	mvn r0, r0
-	pop {r4-r6, pc}
-_020246A6:
-	sub r0, r4, #0x1
-	lsl r0, r0, #0x10
-	lsr r2, r0, #0x10
-	add r3, r2, #0x0
-	asr r2, r2, #0x3
-	add r2, r5, r2
-	mov r0, #0x7
-	add r2, #0x44
-	mov r1, #0x1
-	and r3, r0
-	ldrb r2, [r2, #0x0]
-	lsl r1, r3
-	tst r1, r2
-	beq _020246CE
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	add r2, r6, #0x0
-	bl FUN_020242C8
-	pop {r4-r6, pc}
-_020246CE:
-	sub r0, #0x8
-	pop {r4-r6, pc}
-	nop
-_020246D4: .word 0xBEEFCAFE
-_020246D8: .word 0x000001ED
-
-	thumb_func_start FUN_020246DC
-FUN_020246DC: ; 0x020246DC
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	ldr r1, [r5, #0x0]
-	ldr r0, _02024718 ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _020246EE
-	bl ErrorHandling
-_020246EE:
-	mov r0, #0x43
-	mov r2, #0x0
-	lsl r0, r0, #0x2
-_020246F4:
-	add r1, r5, r2
-	ldrb r1, [r1, r0]
-	cmp r1, #0xff
-	beq _02024702
-	add r2, r2, #0x1
-	cmp r2, #0x1c
-	blt _020246F4
-_02024702:
-	cmp r2, r4
-	bgt _0202470C
-	mov r0, #0x0
-	mvn r0, r0
-	pop {r3-r5, pc}
-_0202470C:
-	mov r0, #0x43
-	add r1, r5, r4
-	lsl r0, r0, #0x2
-	ldrb r0, [r1, r0]
-	pop {r3-r5, pc}
-	nop
-_02024718: .word 0xBEEFCAFE
-
-	thumb_func_start FUN_0202471C
-FUN_0202471C: ; 0x0202471C
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r1, [r4, #0x0]
-	ldr r0, _02024744 ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _0202472C
-	bl ErrorHandling
-_0202472C:
-	mov r1, #0x43
-	mov r0, #0x0
-	lsl r1, r1, #0x2
-_02024732:
-	add r2, r4, r0
-	ldrb r2, [r2, r1]
-	cmp r2, #0xff
-	beq _02024740
-	add r0, r0, #0x1
-	cmp r0, #0x1c
-	blt _02024732
-_02024740:
-	pop {r4, pc}
-	nop
-_02024744: .word 0xBEEFCAFE
-
-	thumb_func_start FUN_02024748
-FUN_02024748: ; 0x02024748
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	ldr r1, [r5, #0x0]
-	ldr r0, _0202479C ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _0202475A
-	bl ErrorHandling
-_0202475A:
-	ldr r1, _020247A0 ; =0x000001A6
-	add r0, r5, #0x0
-	bl FUN_02023D8C
-	cmp r0, r4
-	bgt _0202476C
-	mov r0, #0x0
-	mvn r0, r0
-	pop {r3-r5, pc}
-_0202476C:
-	cmp r4, #0x2
-	blt _02024774
-	bl ErrorHandling
-_02024774:
-	add r0, r4, #0x1
-	lsl r0, r0, #0x10
-	lsr r0, r0, #0x10
-	sub r0, r0, #0x1
-	lsl r0, r0, #0x10
-	lsr r2, r0, #0x10
-	mov r0, #0x1
-	mov r1, #0x7
-	and r1, r2
-	add r3, r0, #0x0
-	lsl r3, r1
-	asr r1, r2, #0x3
-	add r2, r5, r1
-	mov r1, #0x42
-	lsl r1, r1, #0x2
-	ldrb r1, [r2, r1]
-	tst r1, r3
-	bne _0202479A
-	mov r0, #0x0
-_0202479A:
-	pop {r3-r5, pc}
-	.balign 4
-_0202479C: .word 0xBEEFCAFE
-_020247A0: .word 0x000001A6
-
-	thumb_func_start FUN_020247A4
-FUN_020247A4: ; 0x020247A4
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r1, [r4, #0x0]
-	ldr r0, _020247C0 ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _020247B4
-	bl ErrorHandling
-_020247B4:
-	ldr r1, _020247C4 ; =0x000001A6
-	add r0, r4, #0x0
-	bl FUN_02023D8C
-	pop {r4, pc}
-	nop
-_020247C0: .word 0xBEEFCAFE
-_020247C4: .word 0x000001A6
-
-	thumb_func_start FUN_020247C8
-FUN_020247C8: ; 0x020247C8
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	ldr r1, [r5, #0x0]
-	ldr r0, _0202481C ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _020247DA
-	bl ErrorHandling
-_020247DA:
-	ldr r1, _02024820 ; =0x000001A7
-	add r0, r5, #0x0
-	bl FUN_02023D8C
-	cmp r0, r4
-	bgt _020247EC
-	mov r0, #0x0
-	mvn r0, r0
-	pop {r3-r5, pc}
-_020247EC:
-	cmp r4, #0x2
-	blt _020247F4
-	bl ErrorHandling
-_020247F4:
-	add r0, r4, #0x1
-	lsl r0, r0, #0x10
-	lsr r0, r0, #0x10
-	sub r0, r0, #0x1
-	lsl r0, r0, #0x10
-	lsr r2, r0, #0x10
-	mov r0, #0x1
-	mov r1, #0x7
-	and r1, r2
-	add r3, r0, #0x0
-	lsl r3, r1
-	asr r1, r2, #0x3
-	add r2, r5, r1
-	ldr r1, _02024824 ; =0x00000109
-	ldrb r1, [r2, r1]
-	tst r1, r3
-	bne _02024818
-	mov r0, #0x0
-_02024818:
-	pop {r3-r5, pc}
-	nop
-_0202481C: .word 0xBEEFCAFE
-_02024820: .word 0x000001A7
-_02024824: .word 0x00000109
-
-	thumb_func_start FUN_02024828
-FUN_02024828: ; 0x02024828
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r1, [r4, #0x0]
-	ldr r0, _02024844 ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _02024838
-	bl ErrorHandling
-_02024838:
-	ldr r1, _02024848 ; =0x000001A7
-	add r0, r4, #0x0
-	bl FUN_02023D8C
-	pop {r4, pc}
-	nop
-_02024844: .word 0xBEEFCAFE
-_02024848: .word 0x000001A7
-
-	thumb_func_start FUN_0202484C
-FUN_0202484C: ; 0x0202484C
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	ldr r1, [r5, #0x0]
-	ldr r0, _02024894 ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _0202485E
-	bl ErrorHandling
-_0202485E:
-	mov r1, #0x67
-	add r0, r5, #0x0
-	lsl r1, r1, #0x2
-	bl FUN_02023F2C
-	cmp r0, r4
-	bgt _02024872
-	mov r0, #0x0
-	mvn r0, r0
-	pop {r3-r5, pc}
-_02024872:
-	cmp r4, #0x3
-	blt _0202487A
-	bl ErrorHandling
-_0202487A:
-	lsl r0, r4, #0x10
-	lsr r2, r0, #0x10
-	asr r0, r2, #0x2
-	add r1, r5, r0
-	ldr r0, _02024898 ; =0x0000010A
-	ldrb r1, [r1, r0]
-	lsl r0, r2, #0x1e
-	lsr r0, r0, #0x1d
-	asr r1, r0
-	mov r0, #0x3
-	and r0, r1
-	pop {r3-r5, pc}
-	nop
-_02024894: .word 0xBEEFCAFE
-_02024898: .word 0x0000010A
-
-	thumb_func_start FUN_0202489C
-FUN_0202489C: ; 0x0202489C
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r1, [r4, #0x0]
-	ldr r0, _020248B8 ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _020248AC
-	bl ErrorHandling
-_020248AC:
-	mov r1, #0x67
-	add r0, r4, #0x0
-	lsl r1, r1, #0x2
-	bl FUN_02023F2C
-	pop {r4, pc}
-	.balign 4
-_020248B8: .word 0xBEEFCAFE
-
-	thumb_func_start FUN_020248BC
-FUN_020248BC: ; 0x020248BC
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	ldr r1, [r5, #0x0]
-	ldr r0, _02024900 ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _020248CE
-	bl ErrorHandling
-_020248CE:
-	ldr r1, _02024904 ; =0x0000019D
-	add r0, r5, #0x0
-	bl FUN_02023F2C
-	cmp r0, r4
-	bgt _020248E0
-	mov r0, #0x0
-	mvn r0, r0
-	pop {r3-r5, pc}
-_020248E0:
-	cmp r4, #0x3
-	blt _020248E8
-	bl ErrorHandling
-_020248E8:
-	lsl r0, r4, #0x10
-	lsr r2, r0, #0x10
-	asr r0, r2, #0x2
-	add r1, r5, r0
-	ldr r0, _02024908 ; =0x0000010B
-	ldrb r1, [r1, r0]
-	lsl r0, r2, #0x1e
-	lsr r0, r0, #0x1d
-	asr r1, r0
-	mov r0, #0x3
-	and r0, r1
-	pop {r3-r5, pc}
-	.balign 4
-_02024900: .word 0xBEEFCAFE
-_02024904: .word 0x0000019D
-_02024908: .word 0x0000010B
-
-	thumb_func_start FUN_0202490C
-FUN_0202490C: ; 0x0202490C
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r1, [r4, #0x0]
-	ldr r0, _02024928 ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _0202491C
-	bl ErrorHandling
-_0202491C:
-	ldr r1, _0202492C ; =0x0000019D
-	add r0, r4, #0x0
-	bl FUN_02023F2C
-	pop {r4, pc}
-	nop
-_02024928: .word 0xBEEFCAFE
-_0202492C: .word 0x0000019D
-
-	thumb_func_start FUN_02024930
-FUN_02024930: ; 0x02024930
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	ldr r1, [r5, #0x0]
-	ldr r0, _0202496C ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _02024942
-	bl ErrorHandling
-_02024942:
-	lsl r0, r4, #0x18
-	lsr r0, r0, #0x18
-	cmp r0, #0x2
-	bhs _02024958
-	lsl r0, r0, #0x2
-	ldr r1, [r5, #0x40]
-	add r0, #0x18
-	lsr r1, r0
-	mov r0, #0xf
-	and r0, r1
-	pop {r3-r5, pc}
-_02024958:
-	add r5, #0x80
-	sub r0, r0, #0x2
-	lsl r0, r0, #0x18
-	ldr r1, [r5, #0x0]
-	lsr r0, r0, #0x16
-	add r0, #0x18
-	lsr r1, r0
-	mov r0, #0xf
-	and r0, r1
-	pop {r3-r5, pc}
-	.balign 4
-_0202496C: .word 0xBEEFCAFE
-
-	thumb_func_start FUN_02024970
-FUN_02024970: ; 0x02024970
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r1, [r4, #0x0]
-	ldr r0, _02024988 ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _02024980
-	bl ErrorHandling
-_02024980:
-	add r0, r4, #0x0
-	bl FUN_020240D0
-	pop {r4, pc}
-	.balign 4
-_02024988: .word 0xBEEFCAFE
-
-	thumb_func_start FUN_0202498C
-FUN_0202498C: ; 0x0202498C
-	push {r3-r7, lr}
-	sub sp, #0x8
-	add r5, r0, #0x0
-	str r1, [sp, #0x0]
-	add r0, r1, #0x0
-	mov r1, #0x5
-	mov r2, #0x0
-	bl GetMonData
-	lsl r0, r0, #0x10
-	lsr r0, r0, #0x10
-	str r0, [sp, #0x4]
-	mov r1, #0x0
-	ldr r0, [sp, #0x0]
-	add r2, r1, #0x0
-	bl GetMonData
-	add r7, r0, #0x0
-	ldr r0, [sp, #0x0]
-	bl GetMonGender
-	add r6, r0, #0x0
-	ldr r1, [r5, #0x0]
-	ldr r0, _02024AE4 ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _020249C4
-	bl ErrorHandling
-_020249C4:
-	ldr r0, [sp, #0x4]
-	cmp r0, #0x0
-	beq _020249D0
-	ldr r1, _02024AE8 ; =0x000001ED
-	cmp r0, r1
-	bls _020249D8
-_020249D0:
-	bl ErrorHandling
-	mov r0, #0x1
-	b _020249DA
-_020249D8:
-	mov r0, #0x0
-_020249DA:
-	cmp r0, #0x0
-	bne _02024ADE
-	ldr r0, [sp, #0x4]
-	mov r2, #0x1
-	sub r0, r0, #0x1
-	lsl r0, r0, #0x10
-	lsr r4, r0, #0x10
-	mov r0, #0x7
-	and r0, r4
-	add r1, r2, #0x0
-	lsl r1, r0
-	asr r0, r4, #0x3
-	add r3, r5, r0
-	add r3, #0x44
-	ldrb r3, [r3, #0x0]
-	tst r3, r1
-	bne _02024A70
-	ldr r1, _02024AEC ; =0x00000147
-	ldr r0, [sp, #0x4]
-	cmp r0, r1
-	bne _02024A08
-	sub r1, #0x43
-	str r7, [r5, r1]
-_02024A08:
-	lsl r0, r6, #0x18
-	lsr r6, r0, #0x18
-	cmp r6, #0x2
-	bls _02024A14
-	bl ErrorHandling
-_02024A14:
-	cmp r6, #0x2
-	bne _02024A1A
-	mov r6, #0x0
-_02024A1A:
-	cmp r6, #0x2
-	blo _02024A22
-	bl ErrorHandling
-_02024A22:
-	add r2, r5, #0x0
-	mov r0, #0x7
-	add r3, r4, #0x0
-	and r3, r0
-	mov r0, #0x1
-	lsl r0, r3
-	add r2, #0xc4
-	asr r1, r4, #0x3
-	ldrb r7, [r2, r1]
-	mvn r0, r0
-	and r0, r7
-	strb r0, [r2, r1]
-	add r0, r6, #0x0
-	ldrb r7, [r2, r1]
-	lsl r0, r3
-	orr r0, r7
-	strb r0, [r2, r1]
-	cmp r6, #0x2
-	blo _02024A4C
-	bl ErrorHandling
-_02024A4C:
-	add r1, r5, #0x0
-	mov r0, #0x7
-	add r2, r4, #0x0
-	and r2, r0
-	mov r3, #0x1
-	lsl r3, r2
-	add r1, #0x84
-	asr r0, r4, #0x3
-	ldrb r7, [r1, r0]
-	mvn r3, r3
-	lsl r6, r2
-	and r3, r7
-	strb r3, [r1, r0]
-	ldrb r3, [r1, r0]
-	add r2, r3, #0x0
-	orr r2, r6
-	strb r2, [r1, r0]
-	b _02024AC0
-_02024A70:
-	add r0, r5, r0
-	add r0, #0x84
-	ldrb r0, [r0, #0x0]
-	tst r0, r1
-	bne _02024A7C
-	mov r2, #0x0
-_02024A7C:
-	lsl r0, r2, #0x18
-	lsr r0, r0, #0x18
-	cmp r0, r6
-	beq _02024AC0
-	lsl r0, r6, #0x18
-	lsr r6, r0, #0x18
-	cmp r6, #0x2
-	bls _02024A90
-	bl ErrorHandling
-_02024A90:
-	cmp r6, #0x2
-	bne _02024A96
-	mov r6, #0x0
-_02024A96:
-	cmp r6, #0x2
-	blo _02024A9E
-	bl ErrorHandling
-_02024A9E:
-	add r1, r5, #0x0
-	mov r0, #0x7
-	add r2, r4, #0x0
-	and r2, r0
-	mov r3, #0x1
-	lsl r3, r2
-	add r1, #0xc4
-	asr r0, r4, #0x3
-	ldrb r7, [r1, r0]
-	mvn r3, r3
-	lsl r6, r2
-	and r3, r7
-	strb r3, [r1, r0]
-	ldrb r3, [r1, r0]
-	add r2, r3, #0x0
-	orr r2, r6
-	strb r2, [r1, r0]
-_02024AC0:
-	ldr r1, [sp, #0x4]
-	ldr r2, [sp, #0x0]
-	add r0, r5, #0x0
-	bl FUN_020241B8
-	mov r1, #0x7
-	add r5, #0x44
-	asr r0, r4, #0x3
-	ldrb r3, [r5, r0]
-	mov r2, #0x1
-	and r1, r4
-	lsl r2, r1
-	add r1, r3, #0x0
-	orr r1, r2
-	strb r1, [r5, r0]
-_02024ADE:
-	add sp, #0x8
-	pop {r3-r7, pc}
-	nop
-_02024AE4: .word 0xBEEFCAFE
-_02024AE8: .word 0x000001ED
-_02024AEC: .word 0x00000147
-
-	thumb_func_start FUN_02024AF0
-FUN_02024AF0: ; 0x02024AF0
-	push {r4-r7, lr}
-	sub sp, #0x14
-	add r4, r0, #0x0
-	str r1, [sp, #0x0]
-	add r0, r1, #0x0
-	mov r1, #0x5
-	mov r2, #0x0
-	bl GetMonData
-	lsl r0, r0, #0x10
-	lsr r6, r0, #0x10
-	ldr r0, [sp, #0x0]
-	mov r1, #0xc
-	mov r2, #0x0
-	bl GetMonData
-	str r0, [sp, #0x8]
-	mov r1, #0x0
-	ldr r0, [sp, #0x0]
-	add r2, r1, #0x0
-	bl GetMonData
-	str r0, [sp, #0x4]
-	ldr r0, [sp, #0x0]
-	bl GetMonGender
-	add r7, r0, #0x0
-	ldr r1, [r4, #0x0]
-	ldr r0, _02024C78 ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _02024B32
-	bl ErrorHandling
-_02024B32:
-	cmp r6, #0x0
-	beq _02024B3C
-	ldr r0, _02024C7C ; =0x000001ED
-	cmp r6, r0
-	bls _02024B44
-_02024B3C:
-	bl ErrorHandling
-	mov r0, #0x1
-	b _02024B46
-_02024B44:
-	mov r0, #0x0
-_02024B46:
-	cmp r0, #0x0
-	beq _02024B4C
-	b _02024C72
-_02024B4C:
-	sub r0, r6, #0x1
-	lsl r0, r0, #0x10
-	lsr r5, r0, #0x10
-	mov r0, #0x1
-	mov r1, #0x7
-	and r1, r5
-	add r2, r0, #0x0
-	asr r3, r5, #0x3
-	lsl r2, r1
-	add r1, r4, r3
-	add r1, #0x44
-	ldrb r1, [r1, #0x0]
-	tst r1, r2
-	bne _02024BEA
-	ldr r1, _02024C80 ; =0x00000147
-	cmp r6, r1
-	bne _02024B74
-	ldr r0, [sp, #0x4]
-	sub r1, #0x43
-	str r0, [r4, r1]
-_02024B74:
-	lsl r0, r7, #0x18
-	lsr r7, r0, #0x18
-	cmp r7, #0x2
-	bls _02024B80
-	bl ErrorHandling
-_02024B80:
-	cmp r7, #0x2
-	bne _02024B86
-	mov r7, #0x0
-_02024B86:
-	cmp r7, #0x2
-	blo _02024B8E
-	bl ErrorHandling
-_02024B8E:
-	mov r0, #0x7
-	and r0, r5
-	str r0, [sp, #0x10]
-	add r0, r4, #0x0
-	add r0, #0xc4
-	asr r3, r5, #0x3
-	ldrb r1, [r0, r3]
-	mov r2, #0x1
-	str r1, [sp, #0xc]
-	ldr r1, [sp, #0x10]
-	lsl r2, r1
-	ldr r1, [sp, #0xc]
-	mvn r2, r2
-	and r1, r2
-	strb r1, [r0, r3]
-	ldrb r1, [r0, r3]
-	add r2, r7, #0x0
-	mov r12, r1
-	ldr r1, [sp, #0x10]
-	lsl r2, r1
-	mov r1, r12
-	orr r1, r2
-	strb r1, [r0, r3]
-	cmp r7, #0x2
-	blo _02024BC4
-	bl ErrorHandling
-_02024BC4:
-	add r1, r4, #0x0
-	mov r0, #0x7
-	add r2, r5, #0x0
-	and r2, r0
-	mov r3, #0x1
-	lsl r3, r2
-	add r1, #0x84
-	asr r0, r5, #0x3
-	ldrb r5, [r1, r0]
-	mvn r3, r3
-	and r3, r5
-	strb r3, [r1, r0]
-	add r5, r7, #0x0
-	ldrb r3, [r1, r0]
-	lsl r5, r2
-	add r2, r3, #0x0
-	orr r2, r5
-	strb r2, [r1, r0]
-	b _02024C3C
-_02024BEA:
-	add r1, r4, r3
-	add r1, #0x84
-	ldrb r1, [r1, #0x0]
-	tst r1, r2
-	bne _02024BF6
-	mov r0, #0x0
-_02024BF6:
-	lsl r0, r0, #0x18
-	lsr r0, r0, #0x18
-	cmp r0, r7
-	beq _02024C3C
-	lsl r0, r7, #0x18
-	lsr r7, r0, #0x18
-	cmp r7, #0x2
-	bls _02024C0A
-	bl ErrorHandling
-_02024C0A:
-	cmp r7, #0x2
-	bne _02024C10
-	mov r7, #0x0
-_02024C10:
-	cmp r7, #0x2
-	blo _02024C18
-	bl ErrorHandling
-_02024C18:
-	add r1, r4, #0x0
-	mov r0, #0x7
-	add r2, r5, #0x0
-	and r2, r0
-	mov r3, #0x1
-	lsl r3, r2
-	add r1, #0xc4
-	asr r0, r5, #0x3
-	ldrb r5, [r1, r0]
-	mvn r3, r3
-	and r3, r5
-	strb r3, [r1, r0]
-	add r5, r7, #0x0
-	ldrb r3, [r1, r0]
-	lsl r5, r2
-	add r2, r3, #0x0
-	orr r2, r5
-	strb r2, [r1, r0]
-_02024C3C:
-	ldr r2, [sp, #0x0]
-	add r0, r4, #0x0
-	add r1, r6, #0x0
-	bl FUN_020241B8
-	ldr r2, [sp, #0x8]
-	add r0, r4, #0x0
-	add r1, r6, #0x0
-	bl FUN_02024294
-	sub r0, r6, #0x1
-	lsl r0, r0, #0x10
-	lsr r6, r0, #0x10
-	add r1, r4, #0x4
-	asr r0, r6, #0x3
-	mov r2, #0x7
-	ldrb r5, [r1, r0]
-	mov r3, #0x1
-	and r2, r6
-	lsl r3, r2
-	add r2, r5, #0x0
-	orr r2, r3
-	add r4, #0x44
-	strb r2, [r1, r0]
-	ldrb r1, [r4, r0]
-	orr r1, r3
-	strb r1, [r4, r0]
-_02024C72:
-	add sp, #0x14
-	pop {r4-r7, pc}
-	nop
-_02024C78: .word 0xBEEFCAFE
-_02024C7C: .word 0x000001ED
-_02024C80: .word 0x00000147
-
-	thumb_func_start Pokedex_SetNatDexFlag
-Pokedex_SetNatDexFlag: ; 0x02024C84
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r1, [r4, #0x0]
-	ldr r0, _02024C9C ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _02024C94
-	bl ErrorHandling
-_02024C94:
-	ldr r0, _02024CA0 ; =0x00000139
-	mov r1, #0x1
-	strb r1, [r4, r0]
-	pop {r4, pc}
-	.balign 4
-_02024C9C: .word 0xBEEFCAFE
-_02024CA0: .word 0x00000139
-
-	thumb_func_start Pokedex_GetNatDexFlag
-Pokedex_GetNatDexFlag: ; 0x02024CA4
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r1, [r4, #0x0]
-	ldr r0, _02024CBC ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _02024CB4
-	bl ErrorHandling
-_02024CB4:
-	ldr r0, _02024CC0 ; =0x00000139
-	ldrb r0, [r4, r0]
-	pop {r4, pc}
-	nop
-_02024CBC: .word 0xBEEFCAFE
-_02024CC0: .word 0x00000139
-
-	thumb_func_start FUN_02024CC4
-FUN_02024CC4: ; 0x02024CC4
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r1, [r4, #0x0]
-	ldr r0, _02024CDC ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _02024CD4
-	bl ErrorHandling
-_02024CD4:
-	mov r0, #0x4a
-	lsl r0, r0, #0x2
-	ldrb r0, [r4, r0]
-	pop {r4, pc}
-	.balign 4
-_02024CDC: .word 0xBEEFCAFE
-
-	thumb_func_start FUN_02024CE0
-FUN_02024CE0: ; 0x02024CE0
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r1, [r4, #0x0]
-	ldr r0, _02024CFC ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _02024CF0
-	bl ErrorHandling
-_02024CF0:
-	mov r0, #0x4a
-	mov r1, #0x1
-	lsl r0, r0, #0x2
-	strb r1, [r4, r0]
-	pop {r4, pc}
-	nop
-_02024CFC: .word 0xBEEFCAFE
-
-	thumb_func_start FUN_02024D00
-FUN_02024D00: ; 0x02024D00
-	push {r4-r6, lr}
-	add r6, r2, #0x0
-	add r4, r0, #0x0
-	add r5, r1, #0x0
-	cmp r6, #0x8
-	blo _02024D10
-	bl ErrorHandling
-_02024D10:
-	ldr r1, [r4, #0x0]
-	ldr r0, _02024D44 ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _02024D1C
-	bl ErrorHandling
-_02024D1C:
-	add r0, r5, #0x0
-	bl FUN_02087A50
-	add r5, r0, #0x0
-	cmp r5, #0xe
-	bne _02024D2C
-	mov r0, #0x0
-	pop {r4-r6, pc}
-_02024D2C:
-	add r0, r6, #0x0
-	bl FUN_02087A1C
-	mov r1, #0x1
-	add r2, r1, #0x0
-	lsl r2, r0
-	ldr r0, _02024D48 ; =0x00000129
-	add r1, r4, r5
-	ldrb r0, [r1, r0]
-	and r0, r2
-	pop {r4-r6, pc}
-	nop
-_02024D44: .word 0xBEEFCAFE
-_02024D48: .word 0x00000129
-
-	thumb_func_start FUN_02024D4C
-FUN_02024D4C: ; 0x02024D4C
-	ldr r1, _02024D54 ; =0x00000137
-	mov r2, #0x1
-	strb r2, [r0, r1]
-	bx lr
-	.balign 4
-_02024D54: .word 0x00000137
-
-	thumb_func_start FUN_02024D58
-FUN_02024D58: ; 0x02024D58
-	ldr r1, _02024D60 ; =0x00000137
-	ldrb r0, [r0, r1]
-	bx lr
-	nop
-_02024D60: .word 0x00000137
-
-	thumb_func_start FUN_02024D64
-FUN_02024D64: ; 0x02024D64
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r1, [r4, #0x0]
-	ldr r0, _02024D7C ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _02024D74
-	bl ErrorHandling
-_02024D74:
-	mov r0, #0x4e
-	lsl r0, r0, #0x2
-	ldrb r0, [r4, r0]
-	pop {r4, pc}
-	.balign 4
-_02024D7C: .word 0xBEEFCAFE
-
-	thumb_func_start FUN_02024D80
-FUN_02024D80: ; 0x02024D80
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r1, [r4, #0x0]
-	ldr r0, _02024D9C ; =0xBEEFCAFE
-	cmp r1, r0
-	beq _02024D90
-	bl ErrorHandling
-_02024D90:
-	mov r0, #0x4e
-	mov r1, #0x1
-	lsl r0, r0, #0x2
-	strb r1, [r4, r0]
-	pop {r4, pc}
-	nop
-_02024D9C: .word 0xBEEFCAFE
-
-	thumb_func_start FUN_02024DA0
-FUN_02024DA0: ; 0x02024DA0
-	ldr r3, _02024DA8 ; =SavArray_get
-	mov r1, #0x7
-	bx r3
-	nop
-_02024DA8: .word SavArray_get
-
-	thumb_func_start FUN_02024DAC
-FUN_02024DAC: ; 0x02024DAC
-	push {r3-r5, lr}
-	add r4, r2, #0x0
-	ldr r2, _02024E60 ; =0x0000019D
-	add r5, r0, #0x0
-	cmp r1, r2
-	bgt _02024DD6
-	sub r3, r2, #0x1
-	cmp r1, r3
-	blt _02024DC6
-	beq _02024E24
-	cmp r1, r2
-	beq _02024E36
-	b _02024E5A
-_02024DC6:
-	cmp r1, #0xc9
-	bgt _02024DCE
-	beq _02024DEE
-	b _02024E5A
-_02024DCE:
-	sub r2, #0x1b
-	cmp r1, r2
-	beq _02024E48
-	b _02024E5A
-_02024DD6:
-	add r3, r2, #0x0
-	add r3, #0x9
-	cmp r1, r3
-	bgt _02024DE6
-	add r2, #0x9
-	cmp r1, r2
-	beq _02024E00
-	b _02024E5A
-_02024DE6:
-	add r2, #0xa
-	cmp r1, r2
-	beq _02024E12
-	b _02024E5A
-_02024DEE:
-	bl FUN_0202471C
-	cmp r4, r0
-	bhs _02024E5A
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl FUN_020246DC
-	pop {r3-r5, pc}
-_02024E00:
-	bl FUN_020247A4
-	cmp r4, r0
-	bhs _02024E5A
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl FUN_02024748
-	pop {r3-r5, pc}
-_02024E12:
-	bl FUN_02024828
-	cmp r4, r0
-	bhs _02024E5A
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl FUN_020247C8
-	pop {r3-r5, pc}
-_02024E24:
-	bl FUN_0202489C
-	cmp r4, r0
-	bhs _02024E5A
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl FUN_0202484C
-	pop {r3-r5, pc}
-_02024E36:
-	bl FUN_0202490C
-	cmp r4, r0
-	bhs _02024E5A
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl FUN_020248BC
-	pop {r3-r5, pc}
-_02024E48:
-	bl FUN_02024970
-	cmp r4, r0
-	bhs _02024E5A
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl FUN_02024930
-	pop {r3-r5, pc}
-_02024E5A:
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	nop
-_02024E60: .word 0x0000019D
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s
index 3f324f9f..482f814b 100644
--- a/arm9/asm/scrcmd.s
+++ b/arm9/asm/scrcmd.s
@@ -9794,7 +9794,7 @@ _0203E7B6:
 	cmp r0, #0x1
 	bne _0203E7DC
 	add r0, r4, #0x0
-	bl FUN_02069B40
+	bl SpeciesToSinnohDexNo
 	cmp r0, #0x0
 	beq _0203E7DC
 	cmp r5, r6
diff --git a/arm9/asm/unk_0206BB28.s b/arm9/asm/unk_0206BB28.s
index c460f6c3..3ddc7960 100644
--- a/arm9/asm/unk_0206BB28.s
+++ b/arm9/asm/unk_0206BB28.s
@@ -30,7 +30,7 @@ FUN_0206BB48: ; 0x0206BB48
 	bne _0206BB58
 	lsl r0, r1, #0x10
 	lsr r0, r0, #0x10
-	bl FUN_02069B40
+	bl SpeciesToSinnohDexNo
 	add r1, r0, #0x0
 _0206BB58:
 	add r0, r1, #0x0
diff --git a/arm9/global.inc b/arm9/global.inc
index 65ecb0e3..754dfe33 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -4799,7 +4799,7 @@
 .extern FUN_020699A4
 .extern FUN_02069A64
 .extern FUN_02069AEC
-.extern FUN_02069B40
+.extern SpeciesToSinnohDexNo
 .extern FUN_02069B60
 .extern FUN_02069B88
 .extern FUN_02069BA0
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index 14a64b6c..1448cc55 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -1261,7 +1261,7 @@ MOD16_021D7E68: ; 0x021D7E68
 	lsl r0, r6, #0x10
 	lsr r0, r0, #0x10
 	add r5, r1, #0
-	bl FUN_02069B40
+	bl SpeciesToSinnohDexNo
 	add r7, r0, #0
 	cmp r7, #0
 	bgt _021D7E82
diff --git a/arm9/src/itemtool.c b/arm9/src/itemtool.c
index 75785ee8..6b892d6d 100644
--- a/arm9/src/itemtool.c
+++ b/arm9/src/itemtool.c
@@ -810,8 +810,8 @@ u32 GetItemAttr_PreloadedItemData(struct ItemData * itemData, u32 attr)
         return itemData->unk6;
     case ITEMATTR_NATURAL_GIFT_POWER:
         return itemData->naturalGiftPower;
-    case ITEMATTR_UNK8_0:
-        return itemData->unk8_0;
+    case ITEMATTR_NATURAL_GIFT_TYPE:
+        return itemData->naturalGiftType;
     case ITEMATTR_UNK8_B:
         return itemData->unk8_B;
     case ITEMATTR_PARTY_USE:
diff --git a/arm9/src/nutdata.c b/arm9/src/nutdata.c
index 27c600fa..2d51b2d3 100644
--- a/arm9/src/nutdata.c
+++ b/arm9/src/nutdata.c
@@ -36,27 +36,27 @@ u32 GetNutAttr(struct NutData * nut, u32 attr)
     switch (attr)
     {
     case 0:
-        return nut->unk0;
+        return nut->size;
     case 1:
-        return nut->unk2;
+        return nut->firmness;
     case 2:
-        return nut->unk3;
+        return nut->yieldCategory;
     case 3:
-        return nut->unk4;
+        return nut->stageDuration;
     case 4:
         return nut->unk5;
     case 5:
-        return nut->unk6;
+        return nut->spicy;
     case 6:
-        return nut->unk7;
+        return nut->dry;
     case 7:
-        return nut->unk8;
+        return nut->sweet;
     case 8:
-        return nut->unk9;
+        return nut->bitter;
     case 9:
-        return nut->unkA;
+        return nut->sour;
     case 10:
-        return nut->unkB;
+        return nut->smoothness;
     default:
         return 0;
     }
diff --git a/arm9/src/pokedex.c b/arm9/src/pokedex.c
new file mode 100644
index 00000000..307196bc
--- /dev/null
+++ b/arm9/src/pokedex.c
@@ -0,0 +1,784 @@
+#include "global.h"
+#include "save_block_2.h"
+#include "heap.h"
+#include "MI_memory.h"
+#include "pokemon.h"
+#include "pokedex.h"
+#include "unk_02087A1C.h"
+#include "constants/species.h"
+
+#pragma thumb on
+
+static inline BOOL CheckDexFlag(u8 * flagArray, u16 species)
+{
+    species--;
+    return (flagArray[species >> 3] & (1 << (species & 7))) != 0;
+}
+
+static inline void UpdateDexFlag(u8 * flagArray, u16 species, u8 state)
+{
+    GF_ASSERT(state < 2);
+    species--;
+    flagArray[species >> 3] &= ~(1 << (species & 7));
+    flagArray[species >> 3] |= (state << (species & 7));
+}
+
+static inline void SetDexFlag(u8 * flagArray, u16 species)
+{
+    species--;
+    flagArray[species >> 3] |= (1 << (species & 7));
+}
+
+static inline s32 CheckDexFlagPair(u8 * flagArray, u16 offset)
+{
+    return (flagArray[offset >> 2] >> (2 * (offset & 3))) & 3;
+}
+
+static inline void UpdateDexFlagPair(u8 * flagArray, u16 offset, u8 state)
+{
+    GF_ASSERT(state < 4);
+    flagArray[offset >> 2] &= ~(3 << (2 * (offset & 3)));
+    flagArray[offset >> 2] |= (state << (2 * (offset & 3)));
+}
+
+u32 Sav2_Pokedex_sizeof(void)
+{
+    return sizeof(struct Pokedex);
+}
+
+struct Pokedex * Sav2_Pokedex_new(u32 heap_id)
+{
+    struct Pokedex * ret = (struct Pokedex *)AllocFromHeap(heap_id, sizeof(struct Pokedex));
+    Sav2_Pokedex_init(ret);
+    return ret;
+}
+
+void Sav2_Pokedex_Copy(const struct Pokedex * src, struct Pokedex * dest)
+{
+    MI_CpuCopy8(src, dest, sizeof(struct Pokedex));
+}
+
+s32 FUN_02023D8C(struct Pokedex * pokedex, u32 species)
+{
+    GF_ASSERT(species == SPECIES_SHELLOS || species == SPECIES_GASTRODON);
+    if (!FUN_020245F0(pokedex, (u16)species))
+        return 0;
+    u8 *flags = species == SPECIES_SHELLOS ? &pokedex->field_0108[0] : &pokedex->field_0108[1];
+    BOOL r2 = CheckDexFlag(flags, 1);
+    BOOL r0 = CheckDexFlag(flags, 2);
+    return (r2 == r0) ? 1 : 2;
+}
+
+BOOL FUN_02023DEC(struct Pokedex * pokedex, u32 species, u8 state)
+{
+    GF_ASSERT(species == SPECIES_SHELLOS || species == SPECIES_GASTRODON);
+    if (!FUN_020245F0(pokedex, (u16)species))
+        return FALSE;
+    u8 *flags = species == SPECIES_SHELLOS ? &pokedex->field_0108[0] : &pokedex->field_0108[1];
+    u32 r0 = (u32)FUN_02023D8C(pokedex, species);
+    for (int i = 0; i < r0; i++)
+    {
+        BOOL r2 = CheckDexFlag(flags, (u16)(i + 1));
+        if (r2 == state)
+            return TRUE;
+    }
+    return FALSE;
+}
+
+void FUN_02023E70(struct Pokedex * pokedex, u32 species, u32 state)
+{
+    GF_ASSERT(species == SPECIES_SHELLOS || species == SPECIES_GASTRODON);
+    if (FUN_02023DEC(pokedex, species, (u8)state))
+        return;
+    u8 *flags = species == SPECIES_SHELLOS ? &pokedex->field_0108[0] : &pokedex->field_0108[1];
+    s32 r5 = FUN_02023D8C(pokedex, species);
+    if (r5 < 2)
+    {
+        UpdateDexFlag(flags, (u16)(r5 + 1), (u8)state);
+        if (r5 == 0)
+        {
+            UpdateDexFlag(flags, (u16)(r5 + 2), (u8)state);
+        }
+    }
+}
+
+s32 FUN_02023F2C(struct Pokedex * pokedex, u32 species)
+{
+    GF_ASSERT(species == SPECIES_BURMY || species == SPECIES_WORMADAM);
+    if (!FUN_020245F0(pokedex, (u16)species))
+        return 0;
+    u8 *flags = species == SPECIES_BURMY ? &pokedex->field_010A[0] : &pokedex->field_010A[1];
+    s32 i;
+    for (i = 0; i < 3; i++)
+    {
+        s32 r2 = CheckDexFlagPair(flags, (u16)i);
+        if (r2 == 3)
+            break;
+    }
+    return i;
+}
+
+BOOL FUN_02023F88(struct Pokedex * pokedex, u32 species, u8 state)
+{
+    GF_ASSERT(species == SPECIES_BURMY || species == SPECIES_WORMADAM);
+    if (!FUN_020245F0(pokedex, (u16)species))
+        return FALSE;
+    u8 *flags = species == SPECIES_BURMY ? &pokedex->field_010A[0] : &pokedex->field_010A[1];
+    s32 i;
+    for (i = 0; i < 3; i++)
+    {
+        s32 r2 = CheckDexFlagPair(flags, (u16)i);
+        if (r2 == state)
+            return TRUE;
+    }
+    return FALSE;
+}
+
+void FUN_02023FEC(struct Pokedex * pokedex, u32 species, s32 state)
+{
+    GF_ASSERT(species == SPECIES_BURMY || species == SPECIES_WORMADAM);
+    if (FUN_02023F88(pokedex, species, (u8)state))
+        return;
+    u8 *flags = species == SPECIES_BURMY ? &pokedex->field_010A[0] : &pokedex->field_010A[1];
+    s32 r5 = FUN_02023F2C(pokedex, species);
+    if (r5 >= 3)
+        return;
+    UpdateDexFlagPair(flags, (u16)r5, (u8)state);
+}
+
+static inline void SetDeoxysFormeFlag(struct Pokedex * pokedex, u8 r4, u8 r6)
+{
+    GF_ASSERT(r6 < 4);
+    GF_ASSERT(r4 <= 15);
+    if (r6 < 2)
+    {
+        pokedex->field_0040 &= ~(15 << (24 + 4 * r6));
+        pokedex->field_0040 |= r4 << (24 + 4 * r6);
+    }
+    else
+    {
+        r6 -= 2;
+        pokedex->field_0080 &= ~(15 << (24 + 4 * r6));
+        pokedex->field_0080 |= r4 << (24 + 4 * r6);
+    }
+}
+
+void FUN_02024068(struct Pokedex * pokedex, u8 r4, u8 r6)
+{
+    SetDeoxysFormeFlag(pokedex, r4, r6);
+}
+
+static inline u32 GetDeoxysFormeFlag(struct Pokedex * pokedex, u8 r6)
+{
+    if (r6 < 2)
+    {
+        return (pokedex->field_0040 >> (24 + 4 * r6)) & 15;
+    }
+    else
+    {
+        r6 -= 2;
+        return (pokedex->field_0080 >> (24 + 4 * r6)) & 15;
+    }
+}
+
+s32 FUN_020240D0(struct Pokedex * pokedex)
+{
+    s32 i;
+    for (i = 0; i < 4; i++)
+    {
+        u32 r2 = GetDeoxysFormeFlag(pokedex, (u8)i);
+        if (r2 == 15)
+            break;
+    }
+    return i;
+}
+
+BOOL FUN_02024114(struct Pokedex * pokedex, u32 state)
+{
+    s32 i;
+    for (i = 0; i < 4; i++)
+    {
+        u32 r4 = GetDeoxysFormeFlag(pokedex, (u8)i);
+        if (state == r4)
+            return TRUE;
+    }
+    return FALSE;
+}
+
+void FUN_0202415C(struct Pokedex * pokedex, u16 species, struct Pokemon * pokemon)
+{
+    u8 forme = (u8)GetMonData(pokemon, MON_DATA_FORME, NULL);
+    if (species == SPECIES_DEOXYS && !FUN_02024114(pokedex, forme))
+    {
+        s32 r2 = FUN_020240D0(pokedex);
+        FUN_02024068(pokedex, forme, (u8)r2);
+    }
+}
+
+void FUN_0202419C(struct Pokedex * pokedex)
+{
+    s32 i;
+    for (i = 0; i < 4; i++)
+    {
+        FUN_02024068(pokedex, 15, (u8)i);
+    }
+}
+
+static inline BOOL HasUnownLetterBeenSeen(struct Pokedex * pokedex, u8 letter)
+{
+    u8 * arr;
+    s32 i;
+    for (i = 0, arr = (u8 *)pokedex; i < 28; i++, arr++)
+    {
+        u8 val = arr[0x010C];
+        if (letter == val)
+            return TRUE;
+    }
+    return FALSE;
+}
+
+static inline s32 FindFirstAvailableUnownLetterSlot(struct Pokedex * pokedex)
+{
+    u8 * arr;
+    s32 i;
+    for (i = 0, arr = (u8 *)pokedex; i < 28; i++, arr++)
+    {
+        u8 val = arr[0x010C];
+        if (val == 0xFF)
+            break;
+    }
+    return i;
+}
+
+static inline void SetSeenUnownLetter(struct Pokedex * pokedex, u32 species, s32 letter)
+{
+#pragma unused(species)
+    s32 idx;
+    if (HasUnownLetterBeenSeen(pokedex, (u8)letter))
+        return;
+    idx = FindFirstAvailableUnownLetterSlot(pokedex);
+    if (idx >= 28)
+        return;
+    pokedex->field_010C[idx] = (u8)letter;
+}
+
+void FUN_020241B8(struct Pokedex * pokedex, u16 species, struct Pokemon * pokemon)
+{
+    if (species == SPECIES_UNOWN)
+    {
+        SetSeenUnownLetter(pokedex, species, GetMonUnownLetter(pokemon));
+    }
+    else if (species == SPECIES_BURMY)
+    {
+        FUN_02023FEC(pokedex, species, (s32)GetMonData(pokemon, MON_DATA_FORME, NULL));
+    }
+    else if (species == SPECIES_WORMADAM)
+    {
+        FUN_02023FEC(pokedex, species, (s32)GetMonData(pokemon, MON_DATA_FORME, NULL));
+    }
+    else if (species == SPECIES_SHELLOS)
+    {
+        FUN_02023E70(pokedex, species, GetMonData(pokemon, MON_DATA_FORME, NULL));
+    }
+    else if (species == SPECIES_GASTRODON)
+    {
+        FUN_02023E70(pokedex, species, GetMonData(pokemon, MON_DATA_FORME, NULL));
+    }
+    else if (species == SPECIES_DEOXYS)
+    {
+        FUN_0202415C(pokedex, species, pokemon);
+    }
+}
+
+void FUN_02024294(struct Pokedex * pokedex, u32 species, u32 language)
+{
+    s32 r4 = FUN_02087A50(species);
+    s32 r0 = FUN_02087A1C(language);
+    if (r4 != 14 && r0 != 6)
+    {
+        pokedex->field_0129[r4] |= (1 << r0);
+    }
+}
+
+s32 FUN_020242C8(struct Pokedex * pokedex, u16 species, s32 r4)
+{
+    u8 r0;
+    u8 r1;
+    if (GetMonBaseStat(species, BASE_GENDER_RATIO) == MON_RATIO_UNKNOWN)
+    {
+        return r4 == 0 ? 2 : -1;
+    }
+    r1 = (u8)CheckDexFlag(pokedex->field_0084, species);
+    if (r4 == 1)
+    {
+        r0 = (u8)CheckDexFlag(pokedex->field_00C4, species);
+        if (r0 == r1)
+            return -1;
+        else
+            return r0;
+    }
+    return r1;
+}
+
+const u16 UNK_020EE940 = SPECIES_MANAPHY;
+
+const u16 UNK_020EE942[] = {
+    SPECIES_MEW,
+    SPECIES_LUGIA,
+    SPECIES_HO_OH,
+    SPECIES_CELEBI,
+    SPECIES_JIRACHI,
+    SPECIES_DEOXYS,
+    SPECIES_PHIONE,
+    SPECIES_MANAPHY,
+    SPECIES_DARKRAI,
+    SPECIES_SHAYMIN,
+    SPECIES_ARCEUS
+};
+
+BOOL FUN_02024340(u16 species)
+{
+    s32 i;
+    BOOL ret = TRUE;
+    for (i = 0; i < (s32)NELEMS(UNK_020EE942); i++)
+    {
+        if (species == UNK_020EE942[i])
+            ret = FALSE;
+    }
+    return ret;
+}
+
+BOOL FUN_02024364(u16 a0)
+{
+    BOOL ret = TRUE;
+    if (a0 == SPECIES_MANAPHY)
+        ret = FALSE;
+    return ret;
+}
+
+void Sav2_Pokedex_init(struct Pokedex * pokedex)
+{
+    memset(pokedex, 0, sizeof(struct Pokedex));
+    pokedex->magic = 0xBEEFCAFE;
+    pokedex->field_0139 = 0;
+    memset(pokedex->field_010C, 0xFF, 28);
+    pokedex->field_0108[0] = 0xFF;
+    pokedex->field_0108[1] = 0xFF;
+    pokedex->field_010A[0] = 0xFF;
+    pokedex->field_010A[1] = 0xFF;
+    FUN_0202419C(pokedex);
+}
+
+u16 FUN_020243C8(struct Pokedex * pokedex)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    s32 i;
+    s32 count = 0;
+    for (i = 1; i <= NATIONAL_DEX_COUNT; i++)
+    {
+        if (FUN_02024594(pokedex, (u16)i) == TRUE)
+            count++;
+    }
+    return (u16)count;
+}
+
+u16 FUN_02024404(struct Pokedex * pokedex)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    s32 i;
+    s32 count = 0;
+    for (i = 1; i <= NATIONAL_DEX_COUNT; i++)
+    {
+        if (FUN_020245F0(pokedex, (u16)i) == TRUE)
+            count++;
+    }
+    return (u16)count;
+}
+
+u16 FUN_02024440(struct Pokedex * pokedex)
+{
+    if (Pokedex_GetNatDexFlag(pokedex))
+        return FUN_02024404(pokedex);
+    else
+        return FUN_020244A4(pokedex);
+}
+
+u16 FUN_0202445C(struct Pokedex * pokedex)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    s32 i;
+    s32 count = 0;
+    for (i = 1; i <= NATIONAL_DEX_COUNT; i++)
+    {
+        if (FUN_02024594(pokedex, (u16)i) == TRUE && SpeciesToSinnohDexNo((u16)i) != 0)
+            count++;
+    }
+    return (u16)count;
+}
+
+u16 FUN_020244A4(struct Pokedex * pokedex)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    s32 i;
+    s32 count = 0;
+    for (i = 1; i <= NATIONAL_DEX_COUNT; i++)
+    {
+        if (FUN_020245F0(pokedex, (u16)i) == TRUE && SpeciesToSinnohDexNo((u16)i) != 0)
+            count++;
+    }
+    return (u16)count;
+}
+
+BOOL FUN_020244EC(struct Pokedex * pokedex)
+{
+    return FUN_02024518(pokedex) >= 482;
+}
+
+BOOL FUN_02024504(struct Pokedex * pokedex)
+{
+    return FUN_02024550(pokedex) >= 150;
+}
+
+u16 FUN_02024518(struct Pokedex * pokedex)
+{
+    s32 i;
+    u16 count = 0;
+    for (i = 1; i <= NATIONAL_DEX_COUNT; i++)
+    {
+        if (FUN_02024594(pokedex, (u16)i) == TRUE && FUN_02024340((u16)i) == TRUE)
+            count++;
+    }
+    return count;
+}
+
+u16 FUN_02024550(struct Pokedex * pokedex)
+{
+    s32 i;
+    u16 count = 0;
+    for (i = 1; i <= NATIONAL_DEX_COUNT; i++)
+    {
+        if (FUN_020245F0(pokedex, (u16)i) == TRUE && SpeciesToSinnohDexNo((u16)i) != 0 && FUN_02024364((u16)i) == TRUE)
+            count++;
+    }
+    return count;
+}
+
+static inline BOOL DexSpeciesIsInvalid(u16 species)
+{
+    if (species == SPECIES_NONE || species > NATIONAL_DEX_COUNT)
+    {
+        GF_ASSERT(0);
+        return TRUE;
+    }
+    return FALSE;
+}
+
+BOOL FUN_02024594(struct Pokedex * pokedex, u16 species)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    if (DexSpeciesIsInvalid(species))
+        return FALSE;
+    if (!CheckDexFlag(pokedex->field_0004, species) || !CheckDexFlag(pokedex->field_0044, species))
+        return FALSE;
+    return TRUE;
+}
+
+BOOL FUN_020245F0(struct Pokedex * pokedex, u16 species)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    if (DexSpeciesIsInvalid(species))
+        return FALSE;
+    return CheckDexFlag(pokedex->field_0044, species);
+}
+
+u32 FUN_02024648(struct Pokedex * pokedex, u32 a1)
+{
+    u32 r6;
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    if (a1 == 0)
+        r6 = (u32)pokedex->field_0104;
+    else
+        GF_ASSERT(0); // r6 is not initialized because execution should halt here
+    return r6;
+}
+
+s32 FUN_02024674(struct Pokedex * pokedex, u16 species, s32 r6)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    if (DexSpeciesIsInvalid(species))
+        return -1;
+    if (CheckDexFlag(pokedex->field_0044, species))
+        return FUN_020242C8(pokedex, species, r6);
+    else
+        return -1;
+}
+
+static inline s32 FindFirstAvailableUnownLetterSlot_2(struct Pokedex * pokedex)
+{
+    s32 i;
+    for (i = 0; i < 28; i++)
+    {
+        if (pokedex->field_010C[i] == 0xFF)
+            break;
+    }
+    return i;
+}
+
+s32 FUN_020246DC(struct Pokedex * pokedex, s32 a1)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    s32 i;
+    i = FindFirstAvailableUnownLetterSlot_2(pokedex);
+    if (i <= a1)
+        return -1;
+    return pokedex->field_010C[a1];
+}
+
+s32 FUN_0202471C(struct Pokedex * pokedex)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    return FindFirstAvailableUnownLetterSlot_2(pokedex);
+}
+
+BOOL FUN_02024748(struct Pokedex * pokedex, s32 a1)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    if (FUN_02023D8C(pokedex, SPECIES_SHELLOS) <= a1)
+        return -1;
+    GF_ASSERT(a1 < 2);
+    return CheckDexFlag(&pokedex->field_0108[0], (u16)(a1 + 1));
+}
+
+s32 FUN_020247A4(struct Pokedex * pokedex)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    return FUN_02023D8C(pokedex, SPECIES_SHELLOS);
+}
+
+BOOL FUN_020247C8(struct Pokedex * pokedex, s32 a1)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    if (FUN_02023D8C(pokedex, SPECIES_GASTRODON) <= a1)
+        return -1;
+    GF_ASSERT(a1 < 2);
+    return CheckDexFlag(&pokedex->field_0108[1], (u16)(a1 + 1));
+}
+
+s32 FUN_02024828(struct Pokedex * pokedex)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    return FUN_02023D8C(pokedex, SPECIES_GASTRODON);
+}
+
+s32 FUN_0202484C(struct Pokedex * pokedex, s32 a1)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    if (FUN_02023F2C(pokedex, SPECIES_BURMY) <= a1)
+        return -1;
+    GF_ASSERT(a1 < 3);
+    return CheckDexFlagPair(&pokedex->field_010A[0], (u16)a1);
+}
+
+s32 FUN_0202489C(struct Pokedex * pokedex)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    return FUN_02023F2C(pokedex, SPECIES_BURMY);
+}
+
+s32 FUN_020248BC(struct Pokedex * pokedex, s32 a1)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    if (FUN_02023F2C(pokedex, SPECIES_WORMADAM) <= a1)
+        return -1;
+    GF_ASSERT(a1 < 3);
+    return CheckDexFlagPair(&pokedex->field_010A[1], (u16)a1);
+}
+
+s32 FUN_0202490C(struct Pokedex * pokedex)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    return FUN_02023F2C(pokedex, SPECIES_WORMADAM);
+}
+
+s32 FUN_02024930(struct Pokedex * pokedex, s32 a1)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    return (s32)GetDeoxysFormeFlag(pokedex, (u8)a1);
+}
+
+s32 FUN_02024970(struct Pokedex * pokedex)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    return FUN_020240D0(pokedex);
+}
+
+static inline void SetSeenCaughtGender(struct Pokedex * pokedex, u16 species, u8 gender)
+{
+    GF_ASSERT(gender <= 2);
+    if (gender == 2)
+        gender = 0;
+    UpdateDexFlag(pokedex->field_00C4, species, gender);
+    UpdateDexFlag(pokedex->field_0084, species, gender);
+}
+
+static inline void SetSeenGender(struct Pokedex * pokedex, u16 species, u8 gender)
+{
+    GF_ASSERT(gender <= 2);
+    if (gender == 2)
+        gender = 0;
+    UpdateDexFlag(pokedex->field_00C4, species, gender);
+}
+
+void FUN_0202498C(struct Pokedex * pokedex, struct Pokemon * pokemon)
+{
+    u16 species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL);
+    u32 personality = GetMonData(pokemon, MON_DATA_PERSONALITY, NULL);
+    u32 gender = GetMonGender(pokemon);
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    if (DexSpeciesIsInvalid(species))
+        return;
+    if (!CheckDexFlag(pokedex->field_0044, species))
+    {
+        if (species == SPECIES_SPINDA)
+            pokedex->field_0104 = personality;
+        SetSeenCaughtGender(pokedex, species, (u8)gender);
+    }
+    else
+    {
+        u8 seen_gender = (u8)CheckDexFlag(pokedex->field_0084, species);
+        if (seen_gender != gender)
+        {
+            SetSeenGender(pokedex, species, (u8)gender);
+        }
+    }
+    FUN_020241B8(pokedex, species, pokemon);
+    SetDexFlag(pokedex->field_0044, species);
+}
+
+void FUN_02024AF0(struct Pokedex * pokedex, struct Pokemon * pokemon)
+{
+    u32 language; // sp08
+    u32 personality; // sp04
+    u32 gender; // r7
+    u16 species; // r6
+
+    species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL);
+    language = GetMonData(pokemon, MON_DATA_GAME_LANGUAGE, NULL);
+    personality = GetMonData(pokemon, MON_DATA_PERSONALITY, NULL);
+    gender = GetMonGender(pokemon);
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    if (DexSpeciesIsInvalid(species))
+        return;
+    if (!CheckDexFlag(pokedex->field_0044, species))
+    {
+        if (species == SPECIES_SPINDA)
+            pokedex->field_0104 = personality;
+        SetSeenCaughtGender(pokedex, species, (u8)gender);
+    }
+    else
+    {
+        u8 seen_gender = (u8)CheckDexFlag(pokedex->field_0084, species);
+        if (seen_gender != gender)
+        {
+            SetSeenGender(pokedex, species, (u8)gender);
+        }
+    }
+    FUN_020241B8(pokedex, species, pokemon);
+    FUN_02024294(pokedex, species, language);
+    SetDexFlag(pokedex->field_0004, species);
+    SetDexFlag(pokedex->field_0044, species);
+}
+
+void Pokedex_SetNatDexFlag(struct Pokedex * pokedex)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    pokedex->field_0139 = 1;
+}
+
+BOOL Pokedex_GetNatDexFlag(struct Pokedex * pokedex)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    return pokedex->field_0139;
+}
+
+BOOL FUN_02024CC4(struct Pokedex * pokedex)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    return pokedex->field_0128;
+}
+
+void FUN_02024CE0(struct Pokedex * pokedex)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    pokedex->field_0128 = 1;
+}
+
+s32 FUN_02024D00(struct Pokedex * pokedex, u32 species, u32 language)
+{
+    GF_ASSERT(language < 8);
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    s32 r5 = FUN_02087A50(species);
+    if (r5 == 14)
+        return 0;
+    s32 r0 = FUN_02087A1C(language);
+    return pokedex->field_0129[r5] & (1 << r0);
+}
+
+void FUN_02024D4C(struct Pokedex * pokedex)
+{
+    pokedex->field_0137 = 1;
+}
+
+BOOL FUN_02024D58(struct Pokedex * pokedex)
+{
+    return pokedex->field_0137;
+}
+
+BOOL FUN_02024D64(struct Pokedex * pokedex)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    return pokedex->field_0138;
+}
+
+void FUN_02024D80(struct Pokedex * pokedex)
+{
+    GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
+    pokedex->field_0138 = 1;
+}
+
+struct Pokedex * FUN_02024DA0(struct SaveBlock2 * sav2)
+{
+    return (struct Pokedex *)SavArray_get(sav2, 7);
+}
+
+s32 FUN_02024DAC(struct Pokedex * pokedex, s32 a1, u32 a2)
+{
+    switch (a1)
+    {
+    case SPECIES_UNOWN:
+        if (a2 < FUN_0202471C(pokedex))
+            return FUN_020246DC(pokedex, (s32)a2);
+        break;
+    case SPECIES_SHELLOS:
+        if (a2 < FUN_020247A4(pokedex))
+            return FUN_02024748(pokedex, (s32)a2);
+        break;
+    case SPECIES_GASTRODON:
+        if (a2 < FUN_02024828(pokedex))
+            return FUN_020247C8(pokedex, (s32)a2);
+        break;
+    case SPECIES_BURMY:
+        if (a2 < FUN_0202489C(pokedex))
+            return FUN_0202484C(pokedex, (s32)a2);
+        break;
+    case SPECIES_WORMADAM:
+        if (a2 < FUN_0202490C(pokedex))
+            return FUN_020248BC(pokedex, (s32)a2);
+        break;
+    case SPECIES_DEOXYS:
+        if (a2 < FUN_02024970(pokedex))
+            return FUN_02024930(pokedex, (s32)a2);
+        break;
+    }
+    return 0;
+}
diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c
index 347cb5ac..0fb6d121 100644
--- a/arm9/src/pokemon.c
+++ b/arm9/src/pokemon.c
@@ -3026,7 +3026,7 @@ u8 FUN_02069AEC(struct PlayerParty * party)
     return ret;
 }
 
-u16 FUN_02069B40(u16 species)
+u16 SpeciesToSinnohDexNo(u16 species)
 {
     u16 ret;
     ReadFromNarcMemberByIdPair(&ret, NARC_POKETOOL_POKEZUKAN, 0, species * sizeof(u16), sizeof(u16));
diff --git a/arm9/src/save_arrays.c b/arm9/src/save_arrays.c
index bccdcc11..4ba492b8 100644
--- a/arm9/src/save_arrays.c
+++ b/arm9/src/save_arrays.c
@@ -11,10 +11,10 @@
 #include "unk_020286F8.h"
 #include "unk_020254B8.h"
 #include "daycare.h"
+#include "pokedex.h"
 
 extern u32 FUN_0202AC20(void);
 extern u32 FUN_02034D7C(void);
-extern u32 Sav2_Pokedex_sizeof(void);
 extern u32 FUN_02024E64(void);
 extern u32 FUN_02034D80(void);
 extern u32 FUN_02025954(void);
@@ -40,7 +40,6 @@ extern u32 FUN_0202C0E0(void);
 extern u32 FUN_02013B28(void);
 extern void FUN_0202AC28(void *);
 extern void FUN_02034D98(void *);
-extern void Sav2_Pokedex_init(void *);
 extern void FUN_02024E6C(void *);
 extern void FUN_02034D88(void *);
 extern void FUN_0202597C(void *);
diff --git a/files/itemtool/itemdata/item_data.json b/files/itemtool/itemdata/item_data.json
index 99b0c3ba..d4fd5359 100644
--- a/files/itemtool/itemdata/item_data.json
+++ b/files/itemtool/itemdata/item_data.json
@@ -1,25 +1,6 @@
 {

   "item_data": [

     {

-      "name": "ITEM_NONE",

-      "price": 0,

-      "holdEffect": "HOLD_EFFECT_NONE",

-      "holdEffectParam": 0,

-      "unk4": 0,

-      "unk5": 0,

-      "unk6": 0,

-      "naturalGiftPower": 0,

-      "unk8_0": 0,

-      "prevent_toss": 0,

-      "selectable": 0,

-      "pocket": "POCKET_ITEMS",

-      "unk8_B": 0,

-      "unkA": 0,

-      "unkB": 0,

-      "partyUse": 0,

-      "partyUseParam": 0

-    },

-    {

       "name": "ITEM_MASTER_BALL",

       "price": 0,

       "holdEffect": "HOLD_EFFECT_NONE",

@@ -28,7 +9,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BALLS",

@@ -47,7 +28,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BALLS",

@@ -66,7 +47,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BALLS",

@@ -85,7 +66,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BALLS",

@@ -104,7 +85,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BALLS",

@@ -123,7 +104,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BALLS",

@@ -142,7 +123,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BALLS",

@@ -161,7 +142,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BALLS",

@@ -180,7 +161,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BALLS",

@@ -199,7 +180,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BALLS",

@@ -218,7 +199,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BALLS",

@@ -237,7 +218,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BALLS",

@@ -256,7 +237,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BALLS",

@@ -275,7 +256,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BALLS",

@@ -294,7 +275,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BALLS",

@@ -313,7 +294,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BALLS",

@@ -332,7 +313,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -396,7 +377,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -460,7 +441,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -524,7 +505,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -588,7 +569,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -652,7 +633,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -716,7 +697,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -780,7 +761,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -844,7 +825,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -908,7 +889,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -972,7 +953,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -1036,7 +1017,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -1100,7 +1081,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -1164,7 +1145,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -1228,7 +1209,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -1292,7 +1273,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -1356,7 +1337,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -1420,7 +1401,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -1484,7 +1465,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -1548,7 +1529,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -1612,7 +1593,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -1676,7 +1657,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -1740,7 +1721,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -1804,7 +1785,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -1868,7 +1849,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -1932,7 +1913,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -1996,7 +1977,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -2060,7 +2041,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -2124,7 +2105,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -2188,7 +2169,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -2252,7 +2233,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -2316,7 +2297,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -2380,7 +2361,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -2444,7 +2425,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -2508,7 +2489,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -2572,7 +2553,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -2636,7 +2617,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -2700,7 +2681,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MEDICINE",

@@ -2764,7 +2745,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BATTLE_ITEMS",

@@ -2828,7 +2809,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BATTLE_ITEMS",

@@ -2892,7 +2873,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BATTLE_ITEMS",

@@ -2956,7 +2937,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BATTLE_ITEMS",

@@ -3020,7 +3001,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BATTLE_ITEMS",

@@ -3084,7 +3065,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BATTLE_ITEMS",

@@ -3148,7 +3129,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BATTLE_ITEMS",

@@ -3212,7 +3193,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BATTLE_ITEMS",

@@ -3276,7 +3257,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BATTLE_ITEMS",

@@ -3340,7 +3321,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BATTLE_ITEMS",

@@ -3404,7 +3385,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BATTLE_ITEMS",

@@ -3468,7 +3449,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BATTLE_ITEMS",

@@ -3532,7 +3513,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BATTLE_ITEMS",

@@ -3596,7 +3577,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -3660,7 +3641,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -3724,7 +3705,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -3788,7 +3769,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -3852,7 +3833,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -3916,7 +3897,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -3980,7 +3961,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -4044,7 +4025,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -4108,7 +4089,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -4172,7 +4153,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -4236,7 +4217,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -4300,7 +4281,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -4364,7 +4345,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -4428,7 +4409,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -4492,7 +4473,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -4556,7 +4537,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -4620,7 +4601,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -4684,7 +4665,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -4748,7 +4729,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -4812,7 +4793,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -4876,7 +4857,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -4940,7 +4921,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -5004,7 +4985,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -5068,7 +5049,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -5132,7 +5113,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -5196,7 +5177,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -5260,7 +5241,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -5324,7 +5305,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -5388,7 +5369,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -5452,7 +5433,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -5516,7 +5497,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -5580,7 +5561,7 @@
       "unk5": 0,

       "unk6": 100,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -5644,7 +5625,7 @@
       "unk5": 0,

       "unk6": 100,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -5708,7 +5689,7 @@
       "unk5": 0,

       "unk6": 100,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -5772,7 +5753,7 @@
       "unk5": 0,

       "unk6": 100,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -5836,7 +5817,7 @@
       "unk5": 0,

       "unk6": 100,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -5900,7 +5881,7 @@
       "unk5": 0,

       "unk6": 100,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -5964,7 +5945,7 @@
       "unk5": 0,

       "unk6": 100,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -6028,7 +6009,7 @@
       "unk5": 0,

       "unk6": 100,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -6092,7 +6073,7 @@
       "unk5": 0,

       "unk6": 80,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -6156,7 +6137,7 @@
       "unk5": 0,

       "unk6": 80,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -6220,7 +6201,7 @@
       "unk5": 0,

       "unk6": 80,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -6284,7 +6265,7 @@
       "unk5": 0,

       "unk6": 80,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -6348,7 +6329,7 @@
       "unk5": 0,

       "unk6": 80,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -6412,7 +6393,7 @@
       "unk5": 0,

       "unk6": 60,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -6431,7 +6412,7 @@
       "unk5": 0,

       "unk6": 60,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -6450,7 +6431,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MAIL",

@@ -6469,7 +6450,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MAIL",

@@ -6488,7 +6469,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MAIL",

@@ -6507,7 +6488,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MAIL",

@@ -6526,7 +6507,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MAIL",

@@ -6545,7 +6526,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MAIL",

@@ -6564,7 +6545,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MAIL",

@@ -6583,7 +6564,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MAIL",

@@ -6602,7 +6583,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MAIL",

@@ -6621,7 +6602,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MAIL",

@@ -6640,7 +6621,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MAIL",

@@ -6659,7 +6640,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_MAIL",

@@ -6678,7 +6659,7 @@
       "unk5": 1,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 10,

+      "naturalGiftType": "TYPE_FIRE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -6742,7 +6723,7 @@
       "unk5": 2,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 11,

+      "naturalGiftType": "TYPE_WATER",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -6806,7 +6787,7 @@
       "unk5": 3,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 13,

+      "naturalGiftType": "TYPE_ELECTRIC",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -6870,7 +6851,7 @@
       "unk5": 4,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 12,

+      "naturalGiftType": "TYPE_GRASS",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -6934,7 +6915,7 @@
       "unk5": 5,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 15,

+      "naturalGiftType": "TYPE_ICE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -6998,7 +6979,7 @@
       "unk5": 6,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 1,

+      "naturalGiftType": "TYPE_FIGHTING",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -7062,7 +7043,7 @@
       "unk5": 7,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 3,

+      "naturalGiftType": "TYPE_POISON",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -7126,7 +7107,7 @@
       "unk5": 8,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 4,

+      "naturalGiftType": "TYPE_GROUND",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -7190,7 +7171,7 @@
       "unk5": 9,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 2,

+      "naturalGiftType": "TYPE_FLYING",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -7254,7 +7235,7 @@
       "unk5": 10,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 14,

+      "naturalGiftType": "TYPE_PSYCHIC",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -7318,7 +7299,7 @@
       "unk5": 11,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 6,

+      "naturalGiftType": "TYPE_BUG",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -7382,7 +7363,7 @@
       "unk5": 12,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 5,

+      "naturalGiftType": "TYPE_ROCK",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -7446,7 +7427,7 @@
       "unk5": 13,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 7,

+      "naturalGiftType": "TYPE_GHOST",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -7510,7 +7491,7 @@
       "unk5": 14,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 16,

+      "naturalGiftType": "TYPE_DRAGON",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -7574,7 +7555,7 @@
       "unk5": 15,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 17,

+      "naturalGiftType": "TYPE_DARK",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -7638,7 +7619,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 8,

+      "naturalGiftType": "TYPE_STEEL",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -7702,7 +7683,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 70,

-      "unk8_0": 10,

+      "naturalGiftType": "TYPE_FIRE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -7766,7 +7747,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 70,

-      "unk8_0": 11,

+      "naturalGiftType": "TYPE_WATER",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -7830,7 +7811,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 70,

-      "unk8_0": 13,

+      "naturalGiftType": "TYPE_ELECTRIC",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -7894,7 +7875,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 70,

-      "unk8_0": 12,

+      "naturalGiftType": "TYPE_GRASS",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -7958,7 +7939,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 70,

-      "unk8_0": 15,

+      "naturalGiftType": "TYPE_ICE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -8022,7 +8003,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 70,

-      "unk8_0": 1,

+      "naturalGiftType": "TYPE_FIGHTING",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -8086,7 +8067,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 70,

-      "unk8_0": 3,

+      "naturalGiftType": "TYPE_POISON",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -8150,7 +8131,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 70,

-      "unk8_0": 4,

+      "naturalGiftType": "TYPE_GROUND",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -8214,7 +8195,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 70,

-      "unk8_0": 2,

+      "naturalGiftType": "TYPE_FLYING",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -8278,7 +8259,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 70,

-      "unk8_0": 14,

+      "naturalGiftType": "TYPE_PSYCHIC",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -8342,7 +8323,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 70,

-      "unk8_0": 6,

+      "naturalGiftType": "TYPE_BUG",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -8406,7 +8387,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 70,

-      "unk8_0": 5,

+      "naturalGiftType": "TYPE_ROCK",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -8470,7 +8451,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 70,

-      "unk8_0": 7,

+      "naturalGiftType": "TYPE_GHOST",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -8534,7 +8515,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 70,

-      "unk8_0": 16,

+      "naturalGiftType": "TYPE_DRAGON",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -8598,7 +8579,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 70,

-      "unk8_0": 17,

+      "naturalGiftType": "TYPE_DARK",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -8662,7 +8643,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 70,

-      "unk8_0": 8,

+      "naturalGiftType": "TYPE_STEEL",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -8726,7 +8707,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 80,

-      "unk8_0": 10,

+      "naturalGiftType": "TYPE_FIRE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -8790,7 +8771,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 80,

-      "unk8_0": 11,

+      "naturalGiftType": "TYPE_WATER",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -8854,7 +8835,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 80,

-      "unk8_0": 13,

+      "naturalGiftType": "TYPE_ELECTRIC",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -8918,7 +8899,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 10,

+      "naturalGiftType": "TYPE_FIRE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -8982,7 +8963,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 11,

+      "naturalGiftType": "TYPE_WATER",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -9046,7 +9027,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 13,

+      "naturalGiftType": "TYPE_ELECTRIC",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -9110,7 +9091,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 12,

+      "naturalGiftType": "TYPE_GRASS",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -9174,7 +9155,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 15,

+      "naturalGiftType": "TYPE_ICE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -9238,7 +9219,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 1,

+      "naturalGiftType": "TYPE_FIGHTING",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -9302,7 +9283,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 3,

+      "naturalGiftType": "TYPE_POISON",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -9366,7 +9347,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 4,

+      "naturalGiftType": "TYPE_GROUND",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -9430,7 +9411,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 2,

+      "naturalGiftType": "TYPE_FLYING",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -9494,7 +9475,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 14,

+      "naturalGiftType": "TYPE_PSYCHIC",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -9558,7 +9539,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 6,

+      "naturalGiftType": "TYPE_BUG",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -9622,7 +9603,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 5,

+      "naturalGiftType": "TYPE_ROCK",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -9686,7 +9667,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 7,

+      "naturalGiftType": "TYPE_GHOST",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -9750,7 +9731,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 16,

+      "naturalGiftType": "TYPE_DRAGON",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -9814,7 +9795,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 17,

+      "naturalGiftType": "TYPE_DARK",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -9878,7 +9859,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 8,

+      "naturalGiftType": "TYPE_STEEL",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -9942,7 +9923,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 60,

-      "unk8_0": 0,

+      "naturalGiftType": 0,

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -10006,7 +9987,7 @@
       "unk5": 16,

       "unk6": 10,

       "naturalGiftPower": 80,

-      "unk8_0": 12,

+      "naturalGiftType": "TYPE_GRASS",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -10070,7 +10051,7 @@
       "unk5": 17,

       "unk6": 10,

       "naturalGiftPower": 80,

-      "unk8_0": 15,

+      "naturalGiftType": "TYPE_ICE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -10134,7 +10115,7 @@
       "unk5": 18,

       "unk6": 10,

       "naturalGiftPower": 80,

-      "unk8_0": 1,

+      "naturalGiftType": "TYPE_FIGHTING",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -10198,7 +10179,7 @@
       "unk5": 19,

       "unk6": 10,

       "naturalGiftPower": 80,

-      "unk8_0": 3,

+      "naturalGiftType": "TYPE_POISON",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -10262,7 +10243,7 @@
       "unk5": 20,

       "unk6": 10,

       "naturalGiftPower": 80,

-      "unk8_0": 4,

+      "naturalGiftType": "TYPE_GROUND",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -10326,7 +10307,7 @@
       "unk5": 21,

       "unk6": 10,

       "naturalGiftPower": 80,

-      "unk8_0": 2,

+      "naturalGiftType": "TYPE_FLYING",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -10390,7 +10371,7 @@
       "unk5": 22,

       "unk6": 10,

       "naturalGiftPower": 80,

-      "unk8_0": 14,

+      "naturalGiftType": "TYPE_PSYCHIC",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -10454,7 +10435,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 80,

-      "unk8_0": 6,

+      "naturalGiftType": "TYPE_BUG",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -10518,7 +10499,7 @@
       "unk5": 23,

       "unk6": 10,

       "naturalGiftPower": 80,

-      "unk8_0": 5,

+      "naturalGiftType": "TYPE_ROCK",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -10582,7 +10563,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 80,

-      "unk8_0": 7,

+      "naturalGiftType": "TYPE_GHOST",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -10646,7 +10627,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 80,

-      "unk8_0": 16,

+      "naturalGiftType": "TYPE_DRAGON",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -10710,7 +10691,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 80,

-      "unk8_0": 17,

+      "naturalGiftType": "TYPE_DARK",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_BERRIES",

@@ -10774,7 +10755,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -10793,7 +10774,7 @@
       "unk5": 24,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -10812,7 +10793,7 @@
       "unk5": 0,

       "unk6": 60,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -10831,7 +10812,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -10850,7 +10831,7 @@
       "unk5": 0,

       "unk6": 80,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -10869,7 +10850,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -10888,7 +10869,7 @@
       "unk5": 25,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -10907,7 +10888,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -10926,7 +10907,7 @@
       "unk5": 26,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -10945,7 +10926,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -10964,7 +10945,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -10983,7 +10964,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11002,7 +10983,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11021,7 +11002,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11040,7 +11021,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11059,7 +11040,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11078,7 +11059,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11097,7 +11078,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11116,7 +11097,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11135,7 +11116,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11154,7 +11135,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11173,7 +11154,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11192,7 +11173,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11211,7 +11192,7 @@
       "unk5": 27,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11230,7 +11211,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11249,7 +11230,7 @@
       "unk5": 0,

       "unk6": 100,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11268,7 +11249,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11287,7 +11268,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11306,7 +11287,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11325,7 +11306,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11344,7 +11325,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11363,7 +11344,7 @@
       "unk5": 0,

       "unk6": 50,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11382,7 +11363,7 @@
       "unk5": 28,

       "unk6": 70,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11401,7 +11382,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11420,7 +11401,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11439,7 +11420,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11458,7 +11439,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11477,7 +11458,7 @@
       "unk5": 0,

       "unk6": 70,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11496,7 +11477,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11515,7 +11496,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11534,7 +11515,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11553,7 +11534,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11572,7 +11553,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11591,7 +11572,7 @@
       "unk5": 0,

       "unk6": 40,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11610,7 +11591,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11629,7 +11610,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11648,7 +11629,7 @@
       "unk5": 0,

       "unk6": 60,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11667,7 +11648,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11686,7 +11667,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11705,7 +11686,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11724,7 +11705,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11743,7 +11724,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11762,7 +11743,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11781,7 +11762,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11800,7 +11781,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11819,7 +11800,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11838,7 +11819,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11857,7 +11838,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11876,7 +11857,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11895,7 +11876,7 @@
       "unk5": 29,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11914,7 +11895,7 @@
       "unk5": 30,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11933,7 +11914,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11952,7 +11933,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11971,7 +11952,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -11990,7 +11971,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12009,7 +11990,7 @@
       "unk5": 0,

       "unk6": 130,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12028,7 +12009,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12047,7 +12028,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12066,7 +12047,7 @@
       "unk5": 0,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12085,7 +12066,7 @@
       "unk5": 0,

       "unk6": 40,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12104,7 +12085,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12123,7 +12104,7 @@
       "unk5": 0,

       "unk6": 60,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12142,7 +12123,7 @@
       "unk5": 0,

       "unk6": 60,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12161,7 +12142,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12180,7 +12161,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12199,7 +12180,7 @@
       "unk5": 0,

       "unk6": 80,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12218,7 +12199,7 @@
       "unk5": 0,

       "unk6": 70,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12237,7 +12218,7 @@
       "unk5": 0,

       "unk6": 70,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12256,7 +12237,7 @@
       "unk5": 0,

       "unk6": 70,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12275,7 +12256,7 @@
       "unk5": 0,

       "unk6": 70,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12294,7 +12275,7 @@
       "unk5": 0,

       "unk6": 70,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12313,7 +12294,7 @@
       "unk5": 0,

       "unk6": 70,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12332,7 +12313,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12351,7 +12332,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12370,7 +12351,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12389,7 +12370,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12408,7 +12389,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12427,7 +12408,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12446,7 +12427,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12465,7 +12446,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12484,7 +12465,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12503,7 +12484,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12522,7 +12503,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12541,7 +12522,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12560,7 +12541,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12579,7 +12560,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12598,7 +12579,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12617,7 +12598,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12636,7 +12617,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12655,7 +12636,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12674,7 +12655,7 @@
       "unk5": 0,

       "unk6": 90,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12693,7 +12674,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12712,7 +12693,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12731,7 +12712,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12750,7 +12731,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12769,7 +12750,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12788,7 +12769,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12807,7 +12788,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12826,7 +12807,7 @@
       "unk5": 0,

       "unk6": 80,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12845,7 +12826,7 @@
       "unk5": 0,

       "unk6": 80,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12864,7 +12845,7 @@
       "unk5": 0,

       "unk6": 80,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12883,7 +12864,7 @@
       "unk5": 0,

       "unk6": 50,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12902,7 +12883,7 @@
       "unk5": 0,

       "unk6": 10,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12921,7 +12902,7 @@
       "unk5": 0,

       "unk6": 80,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12940,7 +12921,7 @@
       "unk5": 26,

       "unk6": 30,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_ITEMS",

@@ -12959,7 +12940,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -12978,7 +12959,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -12997,7 +12978,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13016,7 +12997,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13035,7 +13016,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13054,7 +13035,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13073,7 +13054,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13092,7 +13073,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13111,7 +13092,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13130,7 +13111,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13149,7 +13130,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13168,7 +13149,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13187,7 +13168,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13206,7 +13187,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13225,7 +13206,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13244,7 +13225,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13263,7 +13244,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13282,7 +13263,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13301,7 +13282,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13320,7 +13301,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13339,7 +13320,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13358,7 +13339,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13377,7 +13358,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13396,7 +13377,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13415,7 +13396,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13434,7 +13415,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13453,7 +13434,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13472,7 +13453,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13491,7 +13472,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13510,7 +13491,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13529,7 +13510,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13548,7 +13529,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13567,7 +13548,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13586,7 +13567,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13605,7 +13586,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13624,7 +13605,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13643,7 +13624,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13662,7 +13643,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13681,7 +13662,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13700,7 +13681,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13719,7 +13700,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13738,7 +13719,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13757,7 +13738,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13776,7 +13757,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13795,7 +13776,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13814,7 +13795,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13833,7 +13814,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13852,7 +13833,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13871,7 +13852,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13890,7 +13871,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13909,7 +13890,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13928,7 +13909,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13947,7 +13928,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13966,7 +13947,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -13985,7 +13966,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14004,7 +13985,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14023,7 +14004,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14042,7 +14023,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14061,7 +14042,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14080,7 +14061,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14099,7 +14080,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14118,7 +14099,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14137,7 +14118,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14156,7 +14137,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14175,7 +14156,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14194,7 +14175,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14213,7 +14194,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14232,7 +14213,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14251,7 +14232,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14270,7 +14251,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14289,7 +14270,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14308,7 +14289,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14327,7 +14308,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14346,7 +14327,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14365,7 +14346,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14384,7 +14365,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14403,7 +14384,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14422,7 +14403,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14441,7 +14422,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14460,7 +14441,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14479,7 +14460,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14498,7 +14479,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14517,7 +14498,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14536,7 +14517,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14555,7 +14536,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14574,7 +14555,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14593,7 +14574,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14612,7 +14593,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14631,7 +14612,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14650,7 +14631,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14669,7 +14650,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14688,7 +14669,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 0,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14707,7 +14688,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14726,7 +14707,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14745,7 +14726,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14764,7 +14745,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14783,7 +14764,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14802,7 +14783,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14821,7 +14802,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14840,7 +14821,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_TMHMS",

@@ -14859,7 +14840,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 1,

       "pocket": "POCKET_KEY_ITEMS",

@@ -14878,7 +14859,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -14897,7 +14878,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -14916,7 +14897,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 1,

       "pocket": "POCKET_KEY_ITEMS",

@@ -14935,7 +14916,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 1,

       "pocket": "POCKET_KEY_ITEMS",

@@ -14954,7 +14935,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 1,

       "pocket": "POCKET_KEY_ITEMS",

@@ -14973,7 +14954,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 1,

       "pocket": "POCKET_KEY_ITEMS",

@@ -14992,7 +14973,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 1,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15011,7 +14992,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15030,7 +15011,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 1,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15049,7 +15030,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15068,7 +15049,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15087,7 +15068,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15106,7 +15087,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15125,7 +15106,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 1,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15144,7 +15125,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 1,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15163,7 +15144,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 1,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15182,7 +15163,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 1,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15201,7 +15182,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 1,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15220,7 +15201,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 1,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15239,7 +15220,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 1,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15258,7 +15239,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 1,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15277,7 +15258,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 1,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15296,7 +15277,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15315,7 +15296,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15334,7 +15315,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15353,7 +15334,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15372,7 +15353,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 1,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15391,7 +15372,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15410,7 +15391,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15429,7 +15410,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15448,7 +15429,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15467,7 +15448,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15486,7 +15467,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15505,7 +15486,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15524,7 +15505,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

@@ -15543,7 +15524,7 @@
       "unk5": 0,

       "unk6": 0,

       "naturalGiftPower": 0,

-      "unk8_0": 31,

+      "naturalGiftType": "TYPE_NONE",

       "prevent_toss": 1,

       "selectable": 0,

       "pocket": "POCKET_KEY_ITEMS",

diff --git a/files/itemtool/itemdata/item_data.json.txt b/files/itemtool/itemdata/item_data.json.txt
index e1be2fb2..63fec04e 100644
--- a/files/itemtool/itemdata/item_data.json.txt
+++ b/files/itemtool/itemdata/item_data.json.txt
@@ -3,10 +3,12 @@
 #include "global.h"
 #include "itemtool.h"
 #include "constants/items.h"
+#include "constants/pokemon.h"
 
 u32 __size = sizeof(struct ItemData) - 2;
 
 const struct ItemData __data[] = {
+	{ 0 }, // default fallback
 ## for item in item_data
 	{ // {{ item.name }}
 		{{ item.price }},
@@ -16,7 +18,7 @@ const struct ItemData __data[] = {
 		{{ item.unk5 }},
 		{{ item.unk6 }},
 		{{ item.naturalGiftPower }},
-		{{ item.unk8_0 }},
+		{{ item.naturalGiftType }},
 		{{ item.prevent_toss }},
 		{{ item.selectable }},
 		{{ item.pocket }},
diff --git a/files/itemtool/itemdata/item_data/.knarcignore b/files/itemtool/itemdata/item_data/.knarcignore
deleted file mode 100644
index 2856080a..00000000
--- a/files/itemtool/itemdata/item_data/.knarcignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.png
-*.pal
diff --git a/files/itemtool/itemdata/nuts_data.json b/files/itemtool/itemdata/nuts_data.json
new file mode 100644
index 00000000..5b947c2f
--- /dev/null
+++ b/files/itemtool/itemdata/nuts_data.json
@@ -0,0 +1,900 @@
+{

+  "nuts_data": [

+    {

+      "name": "CHERI_BERRY",

+      "size": 20,

+      "firmness": "FIRMNESS_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 3,

+      "unk5": 15,

+      "spicy": 10,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 25

+    },

+    {

+      "name": "CHESTO_BERRY",

+      "size": 80,

+      "firmness": "FIRMNESS_SUPER_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 3,

+      "unk5": 15,

+      "spicy": 0,

+      "dry": 10,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 25

+    },

+    {

+      "name": "PECHA_BERRY",

+      "size": 40,

+      "firmness": "FIRMNESS_VERY_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 3,

+      "unk5": 15,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 10,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 25

+    },

+    {

+      "name": "RAWST_BERRY",

+      "size": 32,

+      "firmness": "FIRMNESS_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 3,

+      "unk5": 15,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 10,

+      "sour": 0,

+      "smoothness": 25

+    },

+    {

+      "name": "ASPEAR_BERRY",

+      "size": 50,

+      "firmness": "FIRMNESS_SUPER_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 3,

+      "unk5": 15,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 10,

+      "smoothness": 25

+    },

+    {

+      "name": "LEPPA_BERRY",

+      "size": 28,

+      "firmness": "FIRMNESS_VERY_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 4,

+      "unk5": 15,

+      "spicy": 10,

+      "dry": 0,

+      "sweet": 10,

+      "bitter": 10,

+      "sour": 10,

+      "smoothness": 20

+    },

+    {

+      "name": "ORAN_BERRY",

+      "size": 35,

+      "firmness": "FIRMNESS_SUPER_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 4,

+      "unk5": 15,

+      "spicy": 10,

+      "dry": 10,

+      "sweet": 0,

+      "bitter": 10,

+      "sour": 10,

+      "smoothness": 20

+    },

+    {

+      "name": "PERSIM_BERRY",

+      "size": 47,

+      "firmness": "FIRMNESS_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 4,

+      "unk5": 15,

+      "spicy": 10,

+      "dry": 10,

+      "sweet": 10,

+      "bitter": 0,

+      "sour": 10,

+      "smoothness": 20

+    },

+    {

+      "name": "LUM_BERRY",

+      "size": 34,

+      "firmness": "FIRMNESS_SUPER_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 12,

+      "unk5": 8,

+      "spicy": 10,

+      "dry": 10,

+      "sweet": 10,

+      "bitter": 10,

+      "sour": 0,

+      "smoothness": 20

+    },

+    {

+      "name": "SITRUS_BERRY",

+      "size": 95,

+      "firmness": "FIRMNESS_VERY_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 8,

+      "unk5": 7,

+      "spicy": 0,

+      "dry": 10,

+      "sweet": 10,

+      "bitter": 10,

+      "sour": 10,

+      "smoothness": 20

+    },

+    {

+      "name": "FIGY_BERRY",

+      "size": 100,

+      "firmness": "FIRMNESS_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 5,

+      "unk5": 10,

+      "spicy": 15,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 25

+    },

+    {

+      "name": "WIKI_BERRY",

+      "size": 115,

+      "firmness": "FIRMNESS_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 5,

+      "unk5": 10,

+      "spicy": 0,

+      "dry": 15,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 25

+    },

+    {

+      "name": "MAGO_BERRY",

+      "size": 126,

+      "firmness": "FIRMNESS_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 5,

+      "unk5": 10,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 15,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 25

+    },

+    {

+      "name": "AGUAV_BERRY",

+      "size": 64,

+      "firmness": "FIRMNESS_SUPER_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 5,

+      "unk5": 10,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 15,

+      "sour": 0,

+      "smoothness": 25

+    },

+    {

+      "name": "IAPAPA_BERRY",

+      "size": 223,

+      "firmness": "FIRMNESS_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 5,

+      "unk5": 10,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 15,

+      "smoothness": 25

+    },

+    {

+      "name": "RAZZ_BERRY",

+      "size": 120,

+      "firmness": "FIRMNESS_VERY_HARD",

+      "yieldCategory": 2,

+      "stageDuration": 2,

+      "unk5": 35,

+      "spicy": 10,

+      "dry": 10,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 20

+    },

+    {

+      "name": "BLUK_BERRY",

+      "size": 108,

+      "firmness": "FIRMNESS_SOFT",

+      "yieldCategory": 2,

+      "stageDuration": 2,

+      "unk5": 35,

+      "spicy": 0,

+      "dry": 10,

+      "sweet": 10,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 20

+    },

+    {

+      "name": "NANAB_BERRY",

+      "size": 77,

+      "firmness": "FIRMNESS_VERY_HARD",

+      "yieldCategory": 2,

+      "stageDuration": 2,

+      "unk5": 35,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 10,

+      "bitter": 10,

+      "sour": 0,

+      "smoothness": 20

+    },

+    {

+      "name": "WEPEAR_BERRY",

+      "size": 74,

+      "firmness": "FIRMNESS_SUPER_HARD",

+      "yieldCategory": 2,

+      "stageDuration": 2,

+      "unk5": 35,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 10,

+      "sour": 10,

+      "smoothness": 20

+    },

+    {

+      "name": "PINAP_BERRY",

+      "size": 80,

+      "firmness": "FIRMNESS_HARD",

+      "yieldCategory": 2,

+      "stageDuration": 2,

+      "unk5": 35,

+      "spicy": 10,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 10,

+      "smoothness": 20

+    },

+    {

+      "name": "POMEG_BERRY",

+      "size": 135,

+      "firmness": "FIRMNESS_VERY_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 8,

+      "unk5": 8,

+      "spicy": 10,

+      "dry": 0,

+      "sweet": 10,

+      "bitter": 10,

+      "sour": 0,

+      "smoothness": 20

+    },

+    {

+      "name": "KELPSY_BERRY",

+      "size": 150,

+      "firmness": "FIRMNESS_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 8,

+      "unk5": 8,

+      "spicy": 0,

+      "dry": 10,

+      "sweet": 0,

+      "bitter": 10,

+      "sour": 10,

+      "smoothness": 20

+    },

+    {

+      "name": "QUALOT_BERRY",

+      "size": 110,

+      "firmness": "FIRMNESS_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 8,

+      "unk5": 8,

+      "spicy": 10,

+      "dry": 0,

+      "sweet": 10,

+      "bitter": 0,

+      "sour": 10,

+      "smoothness": 20

+    },

+    {

+      "name": "HONDEW_BERRY",

+      "size": 162,

+      "firmness": "FIRMNESS_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 8,

+      "unk5": 8,

+      "spicy": 10,

+      "dry": 10,

+      "sweet": 0,

+      "bitter": 10,

+      "sour": 0,

+      "smoothness": 20

+    },

+    {

+      "name": "GREPA_BERRY",

+      "size": 149,

+      "firmness": "FIRMNESS_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 8,

+      "unk5": 8,

+      "spicy": 0,

+      "dry": 10,

+      "sweet": 10,

+      "bitter": 0,

+      "sour": 10,

+      "smoothness": 20

+    },

+    {

+      "name": "TAMATO_BERRY",

+      "size": 200,

+      "firmness": "FIRMNESS_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 8,

+      "unk5": 8,

+      "spicy": 20,

+      "dry": 10,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 30

+    },

+    {

+      "name": "CORNN_BERRY",

+      "size": 75,

+      "firmness": "FIRMNESS_HARD",

+      "yieldCategory": 2,

+      "stageDuration": 6,

+      "unk5": 10,

+      "spicy": 0,

+      "dry": 20,

+      "sweet": 10,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 30

+    },

+    {

+      "name": "MAGOST_BERRY",

+      "size": 140,

+      "firmness": "FIRMNESS_HARD",

+      "yieldCategory": 2,

+      "stageDuration": 6,

+      "unk5": 10,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 20,

+      "bitter": 10,

+      "sour": 0,

+      "smoothness": 30

+    },

+    {

+      "name": "RABUTA_BERRY",

+      "size": 226,

+      "firmness": "FIRMNESS_SOFT",

+      "yieldCategory": 2,

+      "stageDuration": 6,

+      "unk5": 10,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 20,

+      "sour": 10,

+      "smoothness": 30

+    },

+    {

+      "name": "NOMEL_BERRY",

+      "size": 285,

+      "firmness": "FIRMNESS_SUPER_HARD",

+      "yieldCategory": 2,

+      "stageDuration": 6,

+      "unk5": 10,

+      "spicy": 10,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 20,

+      "smoothness": 30

+    },

+    {

+      "name": "SPELON_BERRY",

+      "size": 133,

+      "firmness": "FIRMNESS_SOFT",

+      "yieldCategory": 3,

+      "stageDuration": 15,

+      "unk5": 8,

+      "spicy": 30,

+      "dry": 10,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 35

+    },

+    {

+      "name": "PAMTRE_BERRY",

+      "size": 244,

+      "firmness": "FIRMNESS_VERY_SOFT",

+      "yieldCategory": 3,

+      "stageDuration": 15,

+      "unk5": 8,

+      "spicy": 0,

+      "dry": 30,

+      "sweet": 10,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 35

+    },

+    {

+      "name": "WATMEL_BERRY",

+      "size": 250,

+      "firmness": "FIRMNESS_SOFT",

+      "yieldCategory": 3,

+      "stageDuration": 15,

+      "unk5": 8,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 30,

+      "bitter": 10,

+      "sour": 0,

+      "smoothness": 35

+    },

+    {

+      "name": "DURIN_BERRY",

+      "size": 280,

+      "firmness": "FIRMNESS_HARD",

+      "yieldCategory": 3,

+      "stageDuration": 15,

+      "unk5": 8,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 30,

+      "sour": 10,

+      "smoothness": 35

+    },

+    {

+      "name": "BELUE_BERRY",

+      "size": 300,

+      "firmness": "FIRMNESS_VERY_SOFT",

+      "yieldCategory": 3,

+      "stageDuration": 15,

+      "unk5": 8,

+      "spicy": 10,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 30,

+      "smoothness": 35

+    },

+    {

+      "name": "OCCA_BERRY",

+      "size": 90,

+      "firmness": "FIRMNESS_SUPER_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 18,

+      "unk5": 6,

+      "spicy": 15,

+      "dry": 0,

+      "sweet": 10,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 30

+    },

+    {

+      "name": "PASSHO_BERRY",

+      "size": 33,

+      "firmness": "FIRMNESS_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 18,

+      "unk5": 6,

+      "spicy": 0,

+      "dry": 15,

+      "sweet": 0,

+      "bitter": 10,

+      "sour": 0,

+      "smoothness": 30

+    },

+    {

+      "name": "WACAN_BERRY",

+      "size": 250,

+      "firmness": "FIRMNESS_VERY_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 18,

+      "unk5": 6,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 15,

+      "bitter": 0,

+      "sour": 10,

+      "smoothness": 30

+    },

+    {

+      "name": "RINDO_BERRY",

+      "size": 156,

+      "firmness": "FIRMNESS_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 18,

+      "unk5": 6,

+      "spicy": 10,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 15,

+      "sour": 0,

+      "smoothness": 30

+    },

+    {

+      "name": "YACHE_BERRY",

+      "size": 135,

+      "firmness": "FIRMNESS_VERY_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 18,

+      "unk5": 6,

+      "spicy": 0,

+      "dry": 10,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 15,

+      "smoothness": 30

+    },

+    {

+      "name": "CHOPLE_BERRY",

+      "size": 77,

+      "firmness": "FIRMNESS_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 18,

+      "unk5": 6,

+      "spicy": 15,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 10,

+      "sour": 0,

+      "smoothness": 30

+    },

+    {

+      "name": "KEBIA_BERRY",

+      "size": 90,

+      "firmness": "FIRMNESS_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 18,

+      "unk5": 6,

+      "spicy": 0,

+      "dry": 15,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 10,

+      "smoothness": 30

+    },

+    {

+      "name": "SHUCA_BERRY",

+      "size": 42,

+      "firmness": "FIRMNESS_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 18,

+      "unk5": 6,

+      "spicy": 10,

+      "dry": 0,

+      "sweet": 15,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 30

+    },

+    {

+      "name": "COBA_BERRY",

+      "size": 278,

+      "firmness": "FIRMNESS_VERY_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 18,

+      "unk5": 6,

+      "spicy": 0,

+      "dry": 10,

+      "sweet": 0,

+      "bitter": 15,

+      "sour": 0,

+      "smoothness": 30

+    },

+    {

+      "name": "PAYAPA_BERRY",

+      "size": 252,

+      "firmness": "FIRMNESS_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 18,

+      "unk5": 6,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 10,

+      "bitter": 0,

+      "sour": 15,

+      "smoothness": 30

+    },

+    {

+      "name": "TANGA_BERRY",

+      "size": 42,

+      "firmness": "FIRMNESS_VERY_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 18,

+      "unk5": 6,

+      "spicy": 20,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 10,

+      "smoothness": 35

+    },

+    {

+      "name": "CHARTI_BERRY",

+      "size": 28,

+      "firmness": "FIRMNESS_VERY_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 18,

+      "unk5": 6,

+      "spicy": 10,

+      "dry": 20,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 35

+    },

+    {

+      "name": "KASIB_BERRY",

+      "size": 144,

+      "firmness": "FIRMNESS_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 18,

+      "unk5": 6,

+      "spicy": 0,

+      "dry": 10,

+      "sweet": 20,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 35

+    },

+    {

+      "name": "HABAN_BERRY",

+      "size": 23,

+      "firmness": "FIRMNESS_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 18,

+      "unk5": 6,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 10,

+      "bitter": 20,

+      "sour": 0,

+      "smoothness": 35

+    },

+    {

+      "name": "COLBUR_BERRY",

+      "size": 39,

+      "firmness": "FIRMNESS_SUPER_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 18,

+      "unk5": 6,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 10,

+      "sour": 20,

+      "smoothness": 35

+    },

+    {

+      "name": "BABIRI_BERRY",

+      "size": 265,

+      "firmness": "FIRMNESS_SUPER_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 18,

+      "unk5": 6,

+      "spicy": 25,

+      "dry": 10,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 35

+    },

+    {

+      "name": "CHILAN_BERRY",

+      "size": 34,

+      "firmness": "FIRMNESS_VERY_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 18,

+      "unk5": 6,

+      "spicy": 0,

+      "dry": 25,

+      "sweet": 10,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 35

+    },

+    {

+      "name": "LIECHI_BERRY",

+      "size": 111,

+      "firmness": "FIRMNESS_VERY_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 24,

+      "unk5": 4,

+      "spicy": 30,

+      "dry": 10,

+      "sweet": 30,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 40

+    },

+    {

+      "name": "GANLON_BERRY",

+      "size": 33,

+      "firmness": "FIRMNESS_VERY_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 24,

+      "unk5": 4,

+      "spicy": 0,

+      "dry": 30,

+      "sweet": 10,

+      "bitter": 30,

+      "sour": 0,

+      "smoothness": 40

+    },

+    {

+      "name": "SALAC_BERRY",

+      "size": 95,

+      "firmness": "FIRMNESS_VERY_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 24,

+      "unk5": 4,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 30,

+      "bitter": 10,

+      "sour": 30,

+      "smoothness": 40

+    },

+    {

+      "name": "PETAYA_BERRY",

+      "size": 237,

+      "firmness": "FIRMNESS_VERY_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 24,

+      "unk5": 4,

+      "spicy": 30,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 30,

+      "sour": 10,

+      "smoothness": 40

+    },

+    {

+      "name": "APICOT_BERRY",

+      "size": 75,

+      "firmness": "FIRMNESS_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 24,

+      "unk5": 4,

+      "spicy": 10,

+      "dry": 30,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 30,

+      "smoothness": 40

+    },

+    {

+      "name": "LANSAT_BERRY",

+      "size": 97,

+      "firmness": "FIRMNESS_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 24,

+      "unk5": 4,

+      "spicy": 30,

+      "dry": 10,

+      "sweet": 30,

+      "bitter": 10,

+      "sour": 30,

+      "smoothness": 50

+    },

+    {

+      "name": "STARF_BERRY",

+      "size": 153,

+      "firmness": "FIRMNESS_SUPER_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 24,

+      "unk5": 4,

+      "spicy": 30,

+      "dry": 10,

+      "sweet": 30,

+      "bitter": 10,

+      "sour": 30,

+      "smoothness": 50

+    },

+    {

+      "name": "ENIGMA_BERRY",

+      "size": 155,

+      "firmness": "FIRMNESS_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 24,

+      "unk5": 7,

+      "spicy": 40,

+      "dry": 10,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 60

+    },

+    {

+      "name": "MICLE_BERRY",

+      "size": 41,

+      "firmness": "FIRMNESS_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 24,

+      "unk5": 7,

+      "spicy": 0,

+      "dry": 40,

+      "sweet": 10,

+      "bitter": 0,

+      "sour": 0,

+      "smoothness": 60

+    },

+    {

+      "name": "CUSTAP_BERRY",

+      "size": 267,

+      "firmness": "FIRMNESS_SUPER_HARD",

+      "yieldCategory": 1,

+      "stageDuration": 24,

+      "unk5": 7,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 40,

+      "bitter": 10,

+      "sour": 0,

+      "smoothness": 60

+    },

+    {

+      "name": "JABOCA_BERRY",

+      "size": 33,

+      "firmness": "FIRMNESS_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 24,

+      "unk5": 7,

+      "spicy": 0,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 40,

+      "sour": 10,

+      "smoothness": 60

+    },

+    {

+      "name": "ROWAP_BERRY",

+      "size": 52,

+      "firmness": "FIRMNESS_VERY_SOFT",

+      "yieldCategory": 1,

+      "stageDuration": 24,

+      "unk5": 7,

+      "spicy": 10,

+      "dry": 0,

+      "sweet": 0,

+      "bitter": 0,

+      "sour": 40,

+      "smoothness": 60

+    }

+  ]

+}

diff --git a/files/itemtool/itemdata/nuts_data.json.txt b/files/itemtool/itemdata/nuts_data.json.txt
new file mode 100644
index 00000000..c728ff26
--- /dev/null
+++ b/files/itemtool/itemdata/nuts_data.json.txt
@@ -0,0 +1,24 @@
+{{ doNotModifyHeader }}
+
+#include "global.h"
+#include "nutdata.h"
+
+u32 __size = sizeof(struct NutData);
+
+const struct NutData __data[] = {
+## for nut in nuts_data
+	{ // {{ nut.name }}
+		{{ nut.size }},
+		{{ nut.firmness }},
+		{{ nut.yieldCategory }},
+		{{ nut.stageDuration }},
+		{{ nut.unk5 }},
+		{{ nut.spicy }},
+		{{ nut.dry }},
+		{{ nut.sweet }},
+		{{ nut.bitter }},
+		{{ nut.sour }},
+		{{ nut.smoothness }}
+	},
+## endfor
+};
diff --git a/files/itemtool/itemdata/nuts_data/.knarcignore b/files/itemtool/itemdata/nuts_data/.knarcignore
deleted file mode 100644
index 2856080a..00000000
--- a/files/itemtool/itemdata/nuts_data/.knarcignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.png
-*.pal
diff --git a/files/itemtool/itemdata/nuts_data/narc_0000.bin b/files/itemtool/itemdata/nuts_data/narc_0000.bin
deleted file mode 100644
index e3658ca4..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0000.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0001.bin b/files/itemtool/itemdata/nuts_data/narc_0001.bin
deleted file mode 100644
index 3fba3fa2..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0001.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0002.bin b/files/itemtool/itemdata/nuts_data/narc_0002.bin
deleted file mode 100644
index aeb4133b..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0002.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0003.bin b/files/itemtool/itemdata/nuts_data/narc_0003.bin
deleted file mode 100644
index fbd18563..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0003.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0004.bin b/files/itemtool/itemdata/nuts_data/narc_0004.bin
deleted file mode 100644
index 072f58c2..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0004.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0005.bin b/files/itemtool/itemdata/nuts_data/narc_0005.bin
deleted file mode 100644
index 024a96e7..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0005.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0006.bin b/files/itemtool/itemdata/nuts_data/narc_0006.bin
deleted file mode 100644
index 1c2c4fc7..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0006.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0007.bin b/files/itemtool/itemdata/nuts_data/narc_0007.bin
deleted file mode 100644
index 0576a54c..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0007.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0008.bin b/files/itemtool/itemdata/nuts_data/narc_0008.bin
deleted file mode 100644
index 767249bc..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0008.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0009.bin b/files/itemtool/itemdata/nuts_data/narc_0009.bin
deleted file mode 100644
index bc754c98..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0009.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0010.bin b/files/itemtool/itemdata/nuts_data/narc_0010.bin
deleted file mode 100644
index 3782bd29..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0010.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0011.bin b/files/itemtool/itemdata/nuts_data/narc_0011.bin
deleted file mode 100644
index d1527b99..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0011.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0012.bin b/files/itemtool/itemdata/nuts_data/narc_0012.bin
deleted file mode 100644
index 7a826c0d..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0012.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0013.bin b/files/itemtool/itemdata/nuts_data/narc_0013.bin
deleted file mode 100644
index 96738506..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0013.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0014.bin b/files/itemtool/itemdata/nuts_data/narc_0014.bin
deleted file mode 100644
index 78dc116f..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0014.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0015.bin b/files/itemtool/itemdata/nuts_data/narc_0015.bin
deleted file mode 100644
index 77670adb..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0015.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0016.bin b/files/itemtool/itemdata/nuts_data/narc_0016.bin
deleted file mode 100644
index 8c971f7e..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0016.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0017.bin b/files/itemtool/itemdata/nuts_data/narc_0017.bin
deleted file mode 100644
index 48313fb4..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0017.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0018.bin b/files/itemtool/itemdata/nuts_data/narc_0018.bin
deleted file mode 100644
index c35c0e56..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0018.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0019.bin b/files/itemtool/itemdata/nuts_data/narc_0019.bin
deleted file mode 100644
index e2bf02db..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0019.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0020.bin b/files/itemtool/itemdata/nuts_data/narc_0020.bin
deleted file mode 100644
index 00005542..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0020.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0021.bin b/files/itemtool/itemdata/nuts_data/narc_0021.bin
deleted file mode 100644
index 91a7595b..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0021.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0022.bin b/files/itemtool/itemdata/nuts_data/narc_0022.bin
deleted file mode 100644
index f47fa081..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0022.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0023.bin b/files/itemtool/itemdata/nuts_data/narc_0023.bin
deleted file mode 100644
index d733705c..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0023.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0024.bin b/files/itemtool/itemdata/nuts_data/narc_0024.bin
deleted file mode 100644
index 6466cbdb..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0024.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0025.bin b/files/itemtool/itemdata/nuts_data/narc_0025.bin
deleted file mode 100644
index b2e4401f..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0025.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0026.bin b/files/itemtool/itemdata/nuts_data/narc_0026.bin
deleted file mode 100644
index 7f88750c..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0026.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0027.bin b/files/itemtool/itemdata/nuts_data/narc_0027.bin
deleted file mode 100644
index 28605165..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0027.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0028.bin b/files/itemtool/itemdata/nuts_data/narc_0028.bin
deleted file mode 100644
index 6035ffe6..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0028.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0029.bin b/files/itemtool/itemdata/nuts_data/narc_0029.bin
deleted file mode 100644
index df72b443..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0029.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0030.bin b/files/itemtool/itemdata/nuts_data/narc_0030.bin
deleted file mode 100644
index 148d8752..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0030.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0031.bin b/files/itemtool/itemdata/nuts_data/narc_0031.bin
deleted file mode 100644
index a0c27c03..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0031.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0032.bin b/files/itemtool/itemdata/nuts_data/narc_0032.bin
deleted file mode 100644
index a90a1a65..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0032.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0033.bin b/files/itemtool/itemdata/nuts_data/narc_0033.bin
deleted file mode 100644
index 09d23e50..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0033.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0034.bin b/files/itemtool/itemdata/nuts_data/narc_0034.bin
deleted file mode 100644
index 808d9a0c..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0034.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0035.bin b/files/itemtool/itemdata/nuts_data/narc_0035.bin
deleted file mode 100644
index 491871a2..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0035.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0036.bin b/files/itemtool/itemdata/nuts_data/narc_0036.bin
deleted file mode 100644
index e49159e3..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0036.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0037.bin b/files/itemtool/itemdata/nuts_data/narc_0037.bin
deleted file mode 100644
index 3aed0bac..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0037.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0038.bin b/files/itemtool/itemdata/nuts_data/narc_0038.bin
deleted file mode 100644
index 75f24c69..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0038.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0039.bin b/files/itemtool/itemdata/nuts_data/narc_0039.bin
deleted file mode 100644
index f28b658f..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0039.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0040.bin b/files/itemtool/itemdata/nuts_data/narc_0040.bin
deleted file mode 100644
index c68827a3..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0040.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0041.bin b/files/itemtool/itemdata/nuts_data/narc_0041.bin
deleted file mode 100644
index f1515e45..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0041.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0042.bin b/files/itemtool/itemdata/nuts_data/narc_0042.bin
deleted file mode 100644
index a3299190..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0042.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0043.bin b/files/itemtool/itemdata/nuts_data/narc_0043.bin
deleted file mode 100644
index 71d37132..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0043.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0044.bin b/files/itemtool/itemdata/nuts_data/narc_0044.bin
deleted file mode 100644
index 06f0f35a..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0044.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0045.bin b/files/itemtool/itemdata/nuts_data/narc_0045.bin
deleted file mode 100644
index dda7d797..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0045.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0046.bin b/files/itemtool/itemdata/nuts_data/narc_0046.bin
deleted file mode 100644
index a606ce32..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0046.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0047.bin b/files/itemtool/itemdata/nuts_data/narc_0047.bin
deleted file mode 100644
index f6a84583..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0047.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0048.bin b/files/itemtool/itemdata/nuts_data/narc_0048.bin
deleted file mode 100644
index 21e20e6f..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0048.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0049.bin b/files/itemtool/itemdata/nuts_data/narc_0049.bin
deleted file mode 100644
index 11cf3af9..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0049.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0050.bin b/files/itemtool/itemdata/nuts_data/narc_0050.bin
deleted file mode 100644
index f7787977..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0050.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0051.bin b/files/itemtool/itemdata/nuts_data/narc_0051.bin
deleted file mode 100644
index 5240c562..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0051.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0052.bin b/files/itemtool/itemdata/nuts_data/narc_0052.bin
deleted file mode 100644
index 5b435a89..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0052.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0053.bin b/files/itemtool/itemdata/nuts_data/narc_0053.bin
deleted file mode 100644
index d6e6bd28..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0053.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0054.bin b/files/itemtool/itemdata/nuts_data/narc_0054.bin
deleted file mode 100644
index de39971a..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0054.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0055.bin b/files/itemtool/itemdata/nuts_data/narc_0055.bin
deleted file mode 100644
index 496ac40a..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0055.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0056.bin b/files/itemtool/itemdata/nuts_data/narc_0056.bin
deleted file mode 100644
index 67025877..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0056.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0057.bin b/files/itemtool/itemdata/nuts_data/narc_0057.bin
deleted file mode 100644
index 745df4ba..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0057.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0058.bin b/files/itemtool/itemdata/nuts_data/narc_0058.bin
deleted file mode 100644
index 38b30863..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0058.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0059.bin b/files/itemtool/itemdata/nuts_data/narc_0059.bin
deleted file mode 100644
index 11c905be..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0059.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0060.bin b/files/itemtool/itemdata/nuts_data/narc_0060.bin
deleted file mode 100644
index f69c9942..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0060.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0061.bin b/files/itemtool/itemdata/nuts_data/narc_0061.bin
deleted file mode 100644
index 71e39bc8..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0061.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0062.bin b/files/itemtool/itemdata/nuts_data/narc_0062.bin
deleted file mode 100644
index a764e70c..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0062.bin
+++ /dev/null
diff --git a/files/itemtool/itemdata/nuts_data/narc_0063.bin b/files/itemtool/itemdata/nuts_data/narc_0063.bin
deleted file mode 100644
index 0b0f4538..00000000
--- a/files/itemtool/itemdata/nuts_data/narc_0063.bin
+++ /dev/null
diff --git a/filesystem.mk b/filesystem.mk
index 33c1bb8d..7471d644 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -289,6 +289,7 @@ O2NARC_TARGETS := \
 	files/poketool/personal/pms.narc \
 	files/poketool/waza/waza_tbl.narc \
 	files/itemtool/itemdata/item_data.narc \
+	files/itemtool/itemdata/nuts_data.narc \
 
 files/poketool/personal/pms.narc: O2NARCFLAGS = -f
 files/itemtool/itemdata/item_data.narc: O2NARCFLAGS = -p 0xFF
diff --git a/include/constants/items.h b/include/constants/items.h
index 5844c001..34b71487 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -31,7 +31,7 @@
 #define ITEMATTR_UNK5                              9
 #define ITEMATTR_UNK6                             10
 #define ITEMATTR_NATURAL_GIFT_POWER               11
-#define ITEMATTR_UNK8_0                           12
+#define ITEMATTR_NATURAL_GIFT_TYPE                12
 #define ITEMATTR_UNK8_B                           13
 #define ITEMATTR_PARTY_USE                        14
 #define ITEMATTR_SLP_HEAL                         15
diff --git a/include/itemtool.h b/include/itemtool.h
index 4dca94bc..971d91aa 100644
--- a/include/itemtool.h
+++ b/include/itemtool.h
@@ -77,7 +77,7 @@ struct ItemData
     u8 unk5;
     u8 unk6;
     u8 naturalGiftPower;
-    u16 unk8_0:5;
+    u16 naturalGiftType:5;
     u16 prevent_toss:1;
     u16 selectable:1;
     u16 pocket:4;
diff --git a/include/nutdata.h b/include/nutdata.h
index 74470f37..3fb8124e 100644
--- a/include/nutdata.h
+++ b/include/nutdata.h
@@ -3,19 +3,25 @@
 
 #include "filesystem.h"
 
+#define FIRMNESS_VERY_SOFT     1
+#define FIRMNESS_SOFT          2
+#define FIRMNESS_HARD          3
+#define FIRMNESS_VERY_HARD     4
+#define FIRMNESS_SUPER_HARD    5
+
 struct NutData
 {
-    u16 unk0;
-    u8 unk2;
-    u8 unk3;
-    u8 unk4;
+    u16 size;
+    u8 firmness;
+    u8 yieldCategory;
+    u8 stageDuration;
     u8 unk5;
-    u8 unk6;
-    u8 unk7;
-    u8 unk8;
-    u8 unk9;
-    u8 unkA;
-    u8 unkB;
+    u8 spicy;
+    u8 dry;
+    u8 sweet;
+    u8 bitter;
+    u8 sour;
+    u8 smoothness;
 };
 
 NARC * OpenNutsDataNarc(u32 heap_id);
diff --git a/include/pokedex.h b/include/pokedex.h
new file mode 100644
index 00000000..61c051da
--- /dev/null
+++ b/include/pokedex.h
@@ -0,0 +1,86 @@
+#ifndef POKEDIAMOND_POKEDEX_H
+#define POKEDIAMOND_POKEDEX_H
+
+#include "global.h"
+
+struct Pokedex
+{
+    /* 0x0000 */ u32 magic; // BEEFCAFE
+    /* 0x0004 */ u8 field_0004[0x3C];
+    /* 0x0040 */ u32 field_0040; // Deoxys forme plus top 13 dex flags
+    /* 0x0044 */ u8 field_0044[0x3C];
+    /* 0x0080 */ u32 field_0080; // Deoxys forme plus top 13 dex flags
+    /* 0x0084 */ u8 field_0084[0x40]; // Genders
+    /* 0x00C4 */ u8 field_00C4[0x40]; // Genders
+    /* 0x0104 */ u32 field_0104; // spinda personality
+    /* 0x0108 */ u8 field_0108[2]; // Shellos/Gastrodon
+    /* 0x0108 */ u8 field_010A[2]; // Burmy/Wormadam
+    /* 0x010C */ u8 field_010C[28]; // Unown
+    /* 0x0128 */ u8 field_0128;
+    /* 0x0129 */ u8 field_0129[14]; // Meister?
+    /* 0x0137 */ u8 field_0137;
+    /* 0x0138 */ u8 field_0138;
+    /* 0x0139 */ u8 field_0139;
+    /* 0x013A */ u8 padding_013A[2];
+};
+
+u32 Sav2_Pokedex_sizeof(void);
+struct Pokedex * Sav2_Pokedex_new(u32 heap_id);
+void Sav2_Pokedex_Copy(const struct Pokedex * src, struct Pokedex * dest);
+s32 FUN_02023D8C(struct Pokedex * pokedex, u32 species);
+BOOL FUN_02023DEC(struct Pokedex * pokedex, u32 species, u8 state);
+void FUN_02023E70(struct Pokedex * pokedex, u32 species, u32 state);
+s32 FUN_02023F2C(struct Pokedex * pokedex, u32 species);
+BOOL FUN_02023F88(struct Pokedex * pokedex, u32 species, u8 state);
+void FUN_02023FEC(struct Pokedex * pokedex, u32 species, s32 state);
+void FUN_02024068(struct Pokedex * pokedex, u8 r4, u8 r6);
+s32 FUN_020240D0(struct Pokedex * pokedex);
+BOOL FUN_02024114(struct Pokedex * pokedex, u32 state);
+void FUN_0202415C(struct Pokedex * pokedex, u16 species, struct Pokemon * pokemon);
+void FUN_0202419C(struct Pokedex * pokedex);
+void FUN_020241B8(struct Pokedex * pokedex, u16 species, struct Pokemon * pokemon);
+void FUN_02024294(struct Pokedex * pokedex, u32 species, u32 language);
+s32 FUN_020242C8(struct Pokedex * pokedex, u16 species, s32 r4);
+BOOL FUN_02024340(u16 species);
+BOOL FUN_02024364(u16 a0);
+void Sav2_Pokedex_init(struct Pokedex * pokedex);
+u16 FUN_020243C8(struct Pokedex * pokedex);
+u16 FUN_02024404(struct Pokedex * pokedex);
+u16 FUN_02024440(struct Pokedex * pokedex);
+u16 FUN_0202445C(struct Pokedex * pokedex);
+u16 FUN_020244A4(struct Pokedex * pokedex);
+BOOL FUN_020244EC(struct Pokedex * pokedex);
+BOOL FUN_02024504(struct Pokedex * pokedex);
+u16 FUN_02024518(struct Pokedex * pokedex);
+u16 FUN_02024550(struct Pokedex * pokedex);
+BOOL FUN_02024594(struct Pokedex * pokedex, u16 species);
+BOOL FUN_020245F0(struct Pokedex * pokedex, u16 species);
+u32 FUN_02024648(struct Pokedex * pokedex, u32 a1);
+s32 FUN_02024674(struct Pokedex * pokedex, u16 species, s32 r6);
+s32 FUN_020246DC(struct Pokedex * pokedex, s32 a1);
+s32 FUN_0202471C(struct Pokedex * pokedex);
+BOOL FUN_02024748(struct Pokedex * pokedex, s32 a1);
+s32 FUN_020247A4(struct Pokedex * pokedex);
+BOOL FUN_020247C8(struct Pokedex * pokedex, s32 a1);
+s32 FUN_02024828(struct Pokedex * pokedex);
+s32 FUN_0202484C(struct Pokedex * pokedex, s32 a1);
+s32 FUN_0202489C(struct Pokedex * pokedex);
+s32 FUN_020248BC(struct Pokedex * pokedex, s32 a1);
+s32 FUN_0202490C(struct Pokedex * pokedex);
+s32 FUN_02024930(struct Pokedex * pokedex, s32 a1);
+s32 FUN_02024970(struct Pokedex * pokedex);
+void FUN_0202498C(struct Pokedex * pokedex, struct Pokemon * pokemon);
+void FUN_02024AF0(struct Pokedex * pokedex, struct Pokemon * pokemon);
+void Pokedex_SetNatDexFlag(struct Pokedex * pokedex);
+BOOL Pokedex_GetNatDexFlag(struct Pokedex * pokedex);
+BOOL FUN_02024CC4(struct Pokedex * pokedex);
+void FUN_02024CE0(struct Pokedex * pokedex);
+s32 FUN_02024D00(struct Pokedex * pokedex, u32 species, u32 language);
+void FUN_02024D4C(struct Pokedex * pokedex);
+BOOL FUN_02024D58(struct Pokedex * pokedex);
+BOOL FUN_02024D64(struct Pokedex * pokedex);
+void FUN_02024D80(struct Pokedex * pokedex);
+struct Pokedex * FUN_02024DA0(struct SaveBlock2 * sav2);
+s32 FUN_02024DAC(struct Pokedex * pokedex, s32 a1, u32 a2);
+
+#endif //POKEDIAMOND_POKEDEX_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 591da2f4..196343de 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -280,7 +280,7 @@ void FUN_020698E8(struct BoxPokemon * boxmon, int slot1, int slot2);
 void FUN_020699A4(struct Pokemon * pokemon, u32 slot);
 void FUN_02069A64(struct BoxPokemon * src, struct Pokemon * dest);
 u8 FUN_02069AEC(struct PlayerParty * party);
-u16 FUN_02069B40(u16 species);
+u16 SpeciesToSinnohDexNo(u16 species);
 u16 FUN_02069B60(u16 sinnoh_dex);
 void FUN_02069B88(struct Pokemon * src, struct Pokemon * dest);
 void FUN_02069BA0(struct Pokemon * src, struct BoxPokemon * dest);
diff --git a/include/unk_02087A1C.h b/include/unk_02087A1C.h
new file mode 100644
index 00000000..28155209
--- /dev/null
+++ b/include/unk_02087A1C.h
@@ -0,0 +1,7 @@
+#ifndef POKEDIAMOND_UNK_02087A1C_H
+#define POKEDIAMOND_UNK_02087A1C_H
+
+s32 FUN_02087A50(u32 species);
+s32 FUN_02087A1C(u32 language);
+
+#endif //POKEDIAMOND_UNK_02087A1C_H