From 58c79f38fbce8736dd584853a6e3ad41a6c55c14 Mon Sep 17 00:00:00 2001
From: xCrystal <rgr.crystal@gmail.com>
Date: Tue, 6 Feb 2018 19:50:40 +0100
Subject: Fix redundant file names in src/data/

---
 src/data/npcs.asm           | 1513 +++++++++++++++++++++++++++++++++++++++++++
 src/data/unknownNPCData.asm | 1513 -------------------------------------------
 src/data/warp_data.asm      |  250 -------
 src/data/warps.asm          |  250 +++++++
 4 files changed, 1763 insertions(+), 1763 deletions(-)
 create mode 100644 src/data/npcs.asm
 delete mode 100755 src/data/unknownNPCData.asm
 delete mode 100755 src/data/warp_data.asm
 create mode 100644 src/data/warps.asm

(limited to 'src/data')

diff --git a/src/data/npcs.asm b/src/data/npcs.asm
new file mode 100644
index 0000000..c6f4e4d
--- /dev/null
+++ b/src/data/npcs.asm
@@ -0,0 +1,1513 @@
+; When you press the a button in front of something it will find a data entry somewhere on this list
+; it will then jump to the pointer in the data item. All jumps lead to an RST20 operation. 
+PointerTable_118f5:
+	dw Data_119dd
+	dw Data_119dd
+	dw Data_119ea
+	dw Data_11a11
+	dw Data_11a1e
+	dw Data_119dd
+	dw Data_119dd
+	dw Data_11a2b
+	dw Data_11a38
+	dw Data_11a45
+	dw Data_11a52
+	dw Data_11a5f
+	dw Data_11a6c
+	dw Data_11a79
+	dw Data_11a86
+	dw Data_11a93
+	dw Data_11aa0
+	dw Data_11aad
+	dw Data_11aba
+	dw Data_11ac7
+	dw Data_11ad4
+	dw Data_11ae1
+	dw Data_11aee
+	dw Data_11afb
+	dw Data_11b08
+	dw Data_11b15
+	dw Data_11b22
+	dw Data_11b2f
+	dw Data_11b3c
+	dw Data_11b49
+	dw Data_11b56
+	dw SaraData
+	dw AmandaData
+	dw Data_11b7d
+	dw Data_11b8a
+	dw Data_11b97
+	dw Data_11ba4
+	dw Data_11bb1
+	dw Data_11bbe
+	dw Data_11bcb
+	dw Data_11bd8
+	dw Data_11be5
+	dw Data_11bf2
+	dw Data_11bff
+	dw Data_11c0c
+	dw Data_11c19
+	dw Data_11c26
+	dw Data_11c40
+	dw Data_11c4d
+	dw Data_11c5a
+	dw Data_11c67
+	dw Data_11c74
+	dw Data_11c81
+	dw Data_11c8e
+	dw Data_11c9b
+	dw Data_11ca8
+	dw Data_11cb5
+	dw Data_11cc2
+	dw Data_11ccf
+	dw Data_11cdc
+	dw Data_11ce9
+	dw Data_11cf6
+	dw Data_11d03
+	dw Data_11d10
+	dw Data_11d1d
+	dw Data_11d2a
+	dw Data_11d37
+	dw Data_11d44
+	dw Data_11d51
+	dw Data_11d5e
+	dw Data_11d6b
+	dw Data_11d78
+	dw Data_11d85
+	dw Data_11d92
+	dw Data_11d9f
+	dw Data_11dac
+	dw Data_11db9
+	dw Data_11dc6
+	dw Data_11dd3
+	dw Data_11de0
+	dw Data_11ded
+	dw Data_11dfa
+	dw Data_11e07
+	dw Data_11e14
+	dw Data_11e21
+	dw Data_11e2e
+	dw Data_11e3b
+	dw Data_11e48
+	dw Data_11e55
+	dw Data_11e62
+	dw Data_11e6f
+	dw Data_11e7c
+	dw Data_11e89
+	dw Data_11e96
+	dw Data_11ea3
+	dw Data_11eb0
+	dw Data_11ebd
+	dw Data_11eca
+	dw Data_11ed7
+	dw Data_11ee4
+	dw Data_11ef1
+	dw Data_11efe
+	dw Data_11f0b
+	dw Data_11f18
+	dw Data_11f1f
+	dw Data_11f26
+	dw Data_11f2d
+	dw Data_11f34
+	dw Data_11f3b
+	dw Data_11f42
+	dw Data_11f49
+	dw Data_11f49
+	dw Data_11c33
+	dw Data_119f7
+	dw Data_11a04
+	dw Data_11f49
+Data_119dd:
+	db $01
+	db $02
+	db $00
+	db $26
+	db $00
+	dw $5727 ; Pointer to NPC Data
+	db $ac
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_119ea:
+	db $02
+	db $01
+	db $04
+	db $0e
+	db $00
+	dw $5c4b ; Pointer to NPC Data
+	db $ad
+	db $03
+	db $02
+	db $1a
+	db $0f
+	db $16
+Data_119f7:
+	db $71
+	db $01
+	db $04
+	db $0e
+	db $00
+	dw $5c4b ; Pointer to NPC Data
+	db $ad
+	db $03
+	db $02
+	db $1a
+	db $0f
+	db $16
+Data_11a04:
+	db $72
+	db $01
+	db $04
+	db $0e
+	db $00
+	dw $5c4b ; Pointer to NPC Data
+	db $ad
+	db $03
+	db $02
+	db $1a
+	db $0f
+	db $16
+Data_11a11:
+	db $03
+	db $03
+	db $04
+	db $22
+	db $00
+	dw $5b4a ; Pointer to NPC Data
+	db $ae
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11a1e:
+	db $04
+	db $04
+	db $00
+	db $0e
+	db $00
+	dw $5d0d ; Pointer to NPC Data
+	db $af
+	db $03
+	db $04
+	db $34
+	db $10
+	db $15
+Data_11a2b:
+	db $07
+	db $18
+	db $00
+	db $0e
+	db $00
+	dw $561d ; Pointer to NPC Data
+	db $b1
+	db $03
+	db $03
+	db $02
+	db $02
+	db $15
+Data_11a38:
+	db $08
+	db $18
+	db $00
+	db $0e
+	db $00
+	dw $5583 ; Pointer to NPC Data
+	db $b2
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11a45:
+	db $09
+	db $18
+	db $00
+	db $0e
+	db $00
+	dw $55ca ; Pointer to NPC Data
+	db $b2
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11a52:
+	db $0a
+	db $18
+	db $00
+	db $0e
+	db $00
+	dw $55d5 ; Pointer to NPC Data
+	db $b2
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11a5f:
+	db $0b
+	db $18
+	db $00
+	db $0e
+	db $00
+	dw $55e0 ; Pointer to NPC Data
+	db $b2
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11a6c:
+	db $0c
+	db $18
+	db $00
+	db $0e
+	db $00
+	dw $55f9 ; Pointer to NPC Data
+	db $b2
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11a79:
+	db $0d
+	db $18
+	db $00
+	db $0e
+	db $00
+	dw $58bb ; Pointer to NPC Data
+	db $b2
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11a86:
+	db $0e
+	db $21
+	db $0a
+	db $30
+	db $00
+	dw $5c64 ; Pointer to NPC Data
+	db $b3
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11a93:
+	db $0f
+	db $21
+	db $0a
+	db $30
+	db $00
+	dw $5ed1 ; Pointer to NPC Data
+	db $b3
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11aa0:
+	db $10
+	db $21
+	db $0a
+	db $30
+	db $00
+	dw $609e ; Pointer to NPC Data
+	db $b3
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11aad:
+	db $11
+	db $21
+	db $0a
+	db $30
+	db $00
+	dw $6369 ; Pointer to NPC Data
+	db $b3
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11aba:
+	db $12
+	db $21
+	db $0a
+	db $30
+	db $00
+	dw $6566 ; Pointer to NPC Data
+	db $b3
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11ac7:
+	db $13
+	db $21
+	db $0a
+	db $30
+	db $00
+	dw $684c ; Pointer to NPC Data
+	db $b3
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11ad4:
+	db $14
+	db $21
+	db $0a
+	db $30
+	db $00
+	dw $6b53 ; Pointer to NPC Data
+	db $b3
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11ae1:
+	db $15
+	db $21
+	db $0a
+	db $30
+	db $00
+	dw $6d45 ; Pointer to NPC Data
+	db $b3
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11aee:
+	db $16
+	db $21
+	db $0a
+	db $30
+	db $00
+	dw $7025 ; Pointer to NPC Data
+	db $b3
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11afb:
+	db $17
+	db $15
+	db $00
+	db $26
+	db $00
+	dw $5ef2 ; Pointer to NPC Data
+	db $b4
+	db $03
+	db $1d
+	db $1c
+	db $03
+	db $15
+Data_11b08:
+	db $18
+	db $15
+	db $00
+	db $26
+	db $00
+	dw $6573 ; Pointer to NPC Data
+	db $b5
+	db $03
+	db $1e
+	db $1d
+	db $03
+	db $15
+Data_11b15:
+	db $19
+	db $1f
+	db $04
+	db $1a
+	db $00
+	dw $6d96 ; Pointer to NPC Data
+	db $b6
+	db $03
+	db $27
+	db $1e
+	db $03
+	db $15
+Data_11b22:
+	db $1a
+	db $0a
+	db $00
+	db $0e
+	db $00
+	dw $5dc3 ; Pointer to NPC Data
+	db $b7
+	db $03
+	db $0a
+	db $10
+	db $03
+	db $16
+Data_11b2f:
+	db $1b
+	db $15
+	db $00
+	db $16
+	db $00
+	dw $5f39 ; Pointer to NPC Data
+	db $b8
+	db $03
+	db $1a
+	db $21
+	db $03
+	db $15
+Data_11b3c:
+	db $1c
+	db $11
+	db $00
+	db $26
+	db $00
+	dw $5ff0 ; Pointer to NPC Data
+	db $b9
+	db $03
+	db $1b
+	db $1f
+	db $03
+	db $15
+Data_11b49:
+	db $1d
+	db $1a
+	db $00
+	db $16
+	db $00
+	dw $6017 ; Pointer to NPC Data
+	db $ba
+	db $03
+	db $1c
+	db $20
+	db $03
+	db $15
+Data_11b56:
+	db $1e
+	db $0b
+	db $04
+	db $1e
+	db $00
+	dw $603e ; Pointer to NPC Data
+	db $bb
+	db $03
+	db $0b
+	db $11
+	db $03
+	db $16
+SaraData:
+	db SARA ; trainer id
+	db $20
+	db $00
+	db $0e
+	db $00
+	dw OWSequence_Sara ; Pointer to NPC Data
+	db $bc
+	db $03
+	db SARA_PIC ; battle profile picture
+	db $22
+	db $03
+	db $15
+AmandaData:
+	db AMANDA
+	db $20
+	db $00
+	db $16
+	db $00
+	dw OWSequence_Amanda ; Pointer to NPC Data
+	db $bd
+	db $03
+	db AMANDA_PIC
+	db $23
+	db $03
+	db $15
+Data_11b7d:
+	db $21
+	db $16
+	db $00
+	db $26
+	db $00
+	dw OWSequence_Joshua ; Pointer to NPC Data
+	db $be
+	db $03
+	db $17
+	db $24
+	db $03
+	db $15
+Data_11b8a:
+	db $22
+	db $08
+	db $08
+	db $2e
+	db $10
+	dw $6304 ; Pointer to NPC Data
+	db $bf
+	db $03
+	db $08
+	db $12
+	db $03
+	db $16
+Data_11b97:
+	db $23
+	db $1c
+	db $04
+	db $0e
+	db $00
+	dw $6408 ; Pointer to NPC Data
+	db $c0
+	db $03
+	db $26
+	db $25
+	db $03
+	db $15
+Data_11ba4:
+	db $24
+	db $17
+	db $04
+	db $1e
+	db $00
+	dw $642f ; Pointer to NPC Data
+	db $c1
+	db $03
+	db $18
+	db $26
+	db $03
+	db $15
+Data_11bb1:
+	db $25
+	db $17
+	db $04
+	db $1e
+	db $00
+	dw $6456 ; Pointer to NPC Data
+	db $c2
+	db $03
+	db $19
+	db $27
+	db $03
+	db $15
+Data_11bbe:
+	db $26
+	db $09
+	db $00
+	db $16
+	db $00
+	dw $64ad ; Pointer to NPC Data
+	db $c3
+	db $03
+	db $09
+	db $13
+	db $03
+	db $16
+Data_11bcb:
+	db $27
+	db $1c
+	db $04
+	db $0e
+	db $00
+	dw $65d2 ; Pointer to NPC Data
+	db $c4
+	db $03
+	db $21
+	db $28
+	db $03
+	db $15
+Data_11bd8:
+	db $28
+	db $1e
+	db $00
+	db $1e
+	db $00
+	dw $6701 ; Pointer to NPC Data
+	db $c5
+	db $03
+	db $22
+	db $29
+	db $03
+	db $15
+Data_11be5:
+	db $29
+	db $1d
+	db $04
+	db $22
+	db $00
+	dw $6745 ; Pointer to NPC Data
+	db $c6
+	db $03
+	db $23
+	db $2a
+	db $03
+	db $15
+Data_11bf2:
+	db $2a
+	db $05
+	db $00
+	db $1a
+	db $00
+	dw $679e ; Pointer to NPC Data
+	db $c7
+	db $03
+	db $05
+	db $14
+	db $03
+	db $16
+Data_11bff:
+	db $2b
+	db $11
+	db $04
+	db $16
+	db $00
+	dw $6980 ; Pointer to NPC Data
+	db $c8
+	db $03
+	db $20
+	db $2b
+	db $03
+	db $15
+Data_11c0c:
+	db $2c
+	db $12
+	db $04
+	db $1a
+	db $00
+	dw $6a60 ; Pointer to NPC Data
+	db $c9
+	db $03
+	db $1f
+	db $2c
+	db $03
+	db $15
+Data_11c19:
+	db $2d
+	db $1c
+	db $04
+	db $0e
+	db $00
+	dw $6aa2 ; Pointer to NPC Data
+	db $ca
+	db $03
+	db $28
+	db $2d
+	db $03
+	db $15
+Data_11c26:
+	db $2e
+	db $0c
+	db $00
+	db $12
+	db $00
+	dw $6adf ; Pointer to NPC Data
+	db $cb
+	db $03
+	db $0c
+	db $15
+	db $03
+	db $16
+Data_11c33:
+	db $70
+	db $0c
+	db $03
+	db $15
+	db $10
+	dw $6adf ; Pointer to NPC Data
+	db $cb
+	db $03
+	db $0c
+	db $15
+	db $03
+	db $16
+Data_11c40:
+	db $2f
+	db $18
+	db $00
+	db $0e
+	db $00
+	dw $6cdb ; Pointer to NPC Data
+	db $cc
+	db $03
+	db $11
+	db $2e
+	db $03
+	db $15
+Data_11c4d:
+	db $30
+	db $18
+	db $00
+	db $0e
+	db $00
+	dw $6c11 ; Pointer to NPC Data
+	db $cd
+	db $03
+	db $12
+	db $2f
+	db $03
+	db $15
+Data_11c5a:
+	db $31
+	db $18
+	db $00
+	db $0e
+	db $00
+	dw $6c42 ; Pointer to NPC Data
+	db $ce
+	db $03
+	db $13
+	db $30
+	db $03
+	db $15
+Data_11c67:
+	db $32
+	db $06
+	db $00
+	db $0e
+	db $00
+	dw $6c67 ; Pointer to NPC Data
+	db $cf
+	db $03
+	db $06
+	db $16
+	db $03
+	db $16
+Data_11c74:
+	db $33
+	db $12
+	db $04
+	db $1a
+	db $00
+	dw $6eb3 ; Pointer to NPC Data
+	db $d0
+	db $03
+	db $14
+	db $31
+	db $03
+	db $15
+Data_11c81:
+	db $34
+	db $13
+	db $00
+	db $22
+	db $00
+	dw $6ed8 ; Pointer to NPC Data
+	db $d1
+	db $03
+	db $15
+	db $32
+	db $03
+	db $15
+Data_11c8e:
+	db $35
+	db $11
+	db $04
+	db $16
+	db $00
+	dw $6efd ; Pointer to NPC Data
+	db $d2
+	db $03
+	db $16
+	db $33
+	db $03
+	db $15
+Data_11c9b:
+	db $36
+	db $07
+	db $04
+	db $1e
+	db $00
+	dw $6f22 ; Pointer to NPC Data
+	db $d3
+	db $03
+	db $07
+	db $17
+	db $03
+	db $16
+Data_11ca8:
+	db $37
+	db $0d
+	db $00
+	db $12
+	db $00
+	dw $771f ; Pointer to NPC Data
+	db $d4
+	db $03
+	db $0d
+	db $0c
+	db $04
+	db $17
+Data_11cb5:
+	db $38
+	db $0e
+	db $00
+	db $2a
+	db $00
+	dw $772a ; Pointer to NPC Data
+	db $d5
+	db $03
+	db $0e
+	db $0d
+	db $04
+	db $17
+Data_11cc2:
+	db $39
+	db $0f
+	db $00
+	db $26
+	db $00
+	dw $7735 ; Pointer to NPC Data
+	db $d6
+	db $03
+	db $0f
+	db $0e
+	db $04
+	db $17
+Data_11ccf:
+	db $3a
+	db $10
+	db $00
+	db $0e
+	db $00
+	dw $7740 ; Pointer to NPC Data
+	db $d7
+	db $03
+	db $10
+	db $0f
+	db $04
+	db $17
+Data_11cdc:
+	db $3b
+	db $21
+	db $0a
+	db $30
+	db $00
+	dw $4c3e ; Pointer to NPC Data
+	db $b0
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11ce9:
+	db $3c
+	db $21
+	db $0a
+	db $30
+	db $00
+	dw $4c3e ; Pointer to NPC Data
+	db $b0
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11cf6:
+	db $3d
+	db $1a
+	db $00
+	db $16
+	db $00
+	dw $5c76 ; Pointer to NPC Data
+	db $d8
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11d03:
+	db $3e
+	db $23
+	db $04
+	db $1e
+	db $00
+	dw $5f83 ; Pointer to NPC Data
+	db $d9
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11d10:
+	db $3f
+	db $19
+	db $00
+	db $1a
+	db $00
+	dw $5fc0 ; Pointer to NPC Data
+	db $da
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11d1d:
+	db $40
+	db $22
+	db $00
+	db $16
+	db $00
+	dw $60cf ; Pointer to NPC Data
+	db $db
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11d2a:
+	db $41
+	db $1e
+	db $00
+	db $1e
+	db $00
+	dw $6111 ; Pointer to NPC Data
+	db $dc
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11d37:
+	db $42
+	db $19
+	db $00
+	db $1a
+	db $00
+	dw $639a ; Pointer to NPC Data
+	db $da
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11d44:
+	db $43
+	db $1e
+	db $00
+	db $1e
+	db $00
+	dw $661f ; Pointer to NPC Data
+	db $dc
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11d51:
+	db $44
+	db $1b
+	db $00
+	db $22
+	db $00
+	dw $69a5 ; Pointer to NPC Data
+	db $dd
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11d5e:
+	db $45
+	db $12
+	db $04
+	db $1a
+	db $00
+	dw $6b84 ; Pointer to NPC Data
+	db $de
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11d6b:
+	db $46
+	db $11
+	db $04
+	db $16
+	db $00
+	dw $6e2c ; Pointer to NPC Data
+	db $de
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11d78:
+	db $47
+	db $19
+	db $00
+	db $1a
+	db $00
+	dw $6de8 ; Pointer to NPC Data
+	db $da
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11d85:
+	db $48
+	db $22
+	db $00
+	db $16
+	db $00
+	dw $7295 ; Pointer to NPC Data
+	db $b3
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11d92:
+	db $49
+	db $22
+	db $00
+	db $16
+	db $00
+	dw $726c ; Pointer to NPC Data
+	db $b3
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11d9f:
+	db $4a
+	db $22
+	db $00
+	db $16
+	db $00
+	dw $7352 ; Pointer to NPC Data
+	db $df
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11dac:
+	db $4b
+	db $13
+	db $00
+	db $22
+	db $00
+	dw $5d82 ; Pointer to NPC Data
+	db $e0
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11db9:
+	db $4c
+	db $14
+	db $00
+	db $16
+	db $00
+	dw $5d8d ; Pointer to NPC Data
+	db $e1
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11dc6:
+	db $4d
+	db $24
+	db $00
+	db $16
+	db $00
+	dw $5d9f ; Pointer to NPC Data
+	db $e5
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11dd3:
+	db $4e
+	db $1d
+	db $04
+	db $22
+	db $00
+	dw $5fd2 ; Pointer to NPC Data
+	db $dc
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11de0:
+	db $4f
+	db $1a
+	db $00
+	db $16
+	db $00
+	dw $6137 ; Pointer to NPC Data
+	db $d8
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11ded:
+	db $50
+	db $1b
+	db $00
+	db $22
+	db $00
+	dw $613b ; Pointer to NPC Data
+	db $dd
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11dfa:
+	db $51
+	db $1d
+	db $04
+	db $22
+	db $00
+	dw $63d9 ; Pointer to NPC Data
+	db $dc
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11e07:
+	db $52
+	db $17
+	db $04
+	db $1e
+	db $00
+	dw $63dd ; Pointer to NPC Data
+	db $e2
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11e14:
+	db $53
+	db $24
+	db $00
+	db $16
+	db $00
+	dw $66d8 ; Pointer to NPC Data
+	db $e5
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11e21:
+	db $54
+	db $22
+	db $00
+	db $16
+	db $00
+	dw $66e3 ; Pointer to NPC Data
+	db $db
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11e2e:
+	db $55
+	db $12
+	db $04
+	db $1a
+	db $00
+	dw $6850 ; Pointer to NPC Data
+	db $de
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11e3b:
+	db $56
+	db $22
+	db $00
+	db $16
+	db $00
+	dw $6a30 ; Pointer to NPC Data
+	db $db
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11e48:
+	db $57
+	db $19
+	db $00
+	db $1a
+	db $00
+	dw $6a3b ; Pointer to NPC Data
+	db $da
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11e55:
+	db $58
+	db $1a
+	db $00
+	db $16
+	db $00
+	dw $6bc1 ; Pointer to NPC Data
+	db $d8
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11e62:
+	db $59
+	db $18
+	db $00
+	db $0e
+	db $00
+	dw $6bc5 ; Pointer to NPC Data
+	db $e0
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11e6f:
+	db $5a
+	db $13
+	db $00
+	db $22
+	db $00
+	dw $6bed ; Pointer to NPC Data
+	db $e0
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11e7c:
+	db $5b
+	db $23
+	db $04
+	db $1e
+	db $00
+	dw $4c3e ; Pointer to NPC Data
+	db $d9
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11e89:
+	db $5c
+	db $15
+	db $00
+	db $26
+	db $00
+	dw $6e88 ; Pointer to NPC Data
+	db $e4
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11e96:
+	db $5d
+	db $1b
+	db $00
+	db $22
+	db $00
+	dw $709c ; Pointer to NPC Data
+	db $dd
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11ea3:
+	db $5e
+	db $22
+	db $00
+	db $16
+	db $00
+	dw $70a0 ; Pointer to NPC Data
+	db $db
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11eb0:
+	db $5f
+	db $15
+	db $00
+	db $26
+	db $00
+	dw $70a4 ; Pointer to NPC Data
+	db $e3
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11ebd:
+	db $60
+	db $17
+	db $04
+	db $1e
+	db $00
+	dw $70a8 ; Pointer to NPC Data
+	db $e2
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11eca:
+	db $61
+	db $1f
+	db $04
+	db $1a
+	db $00
+	dw $70ac ; Pointer to NPC Data
+	db $dc
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11ed7:
+	db $62
+	db $19
+	db $00
+	db $1a
+	db $00
+	dw $70b0 ; Pointer to NPC Data
+	db $da
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11ee4:
+	db $63
+	db $18
+	db $00
+	db $0e
+	db $00
+	dw $58dd ; Pointer to NPC Data
+	db $e7
+	db $03
+	db $29
+	db $09
+	db $02
+	db $15
+Data_11ef1:
+	db $64
+	db $1a
+	db $00
+	db $16
+	db $00
+	dw $7283 ; Pointer to NPC Data
+	db $e6
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11efe:
+	db $65
+	db $18
+	db $00
+	db $0e
+	db $00
+	dw $58c6 ; Pointer to NPC Data
+	db $b2
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11f0b:
+	db $66
+	db $18
+	db $00
+	db $0e
+	db $00
+	dw $58d1 ; Pointer to NPC Data
+	db $b2
+	db $03
+	db $00
+	db $00
+	db $00
+	db $00
+Data_11f18:
+	db $67
+	db $26
+	db $3a
+	db $3a
+	db $10
+	dw $4c3e ; Pointer to NPC Data
+Data_11f1f:
+	db $68
+	db $27
+	db $3b
+	db $41
+	db $50
+	dw $4c3e ; Pointer to NPC Data
+Data_11f26:
+	db $69
+	db $27
+	db $3c
+	db $42
+	db $50
+	dw $4c3e ; Pointer to NPC Data
+Data_11f2d:
+	db $6a
+	db $27
+	db $3d
+	db $43
+	db $50
+	dw $4c3e ; Pointer to NPC Data
+Data_11f34:
+	db $6b
+	db $27
+	db $3e
+	db $44
+	db $50
+	dw $4c3e ; Pointer to NPC Data
+Data_11f3b:
+	db $6c
+	db $27
+	db $3f
+	db $45
+	db $50
+	dw $4c3e ; Pointer to NPC Data
+Data_11f42:
+	db $6d
+	db $27
+	db $40
+	db $46
+	db $50
+	dw $4c3e ; Pointer to NPC Data
+Data_11f49:
+	db $00
+	db $00
+	db $00
+	db $1e
+	db $00
diff --git a/src/data/unknownNPCData.asm b/src/data/unknownNPCData.asm
deleted file mode 100755
index 2786188..0000000
--- a/src/data/unknownNPCData.asm
+++ /dev/null
@@ -1,1513 +0,0 @@
-; When you press the a button in front of something it will find a data entry somewhere on this list
-; it will then jump to the pointer in the data item. All jumps lead to an RST20 operation. 
-PointerTable_118f5:
-	dw Data_119dd
-	dw Data_119dd
-	dw Data_119ea
-	dw Data_11a11
-	dw Data_11a1e
-	dw Data_119dd
-	dw Data_119dd
-	dw Data_11a2b
-	dw Data_11a38
-	dw Data_11a45
-	dw Data_11a52
-	dw Data_11a5f
-	dw Data_11a6c
-	dw Data_11a79
-	dw Data_11a86
-	dw Data_11a93
-	dw Data_11aa0
-	dw Data_11aad
-	dw Data_11aba
-	dw Data_11ac7
-	dw Data_11ad4
-	dw Data_11ae1
-	dw Data_11aee
-	dw Data_11afb
-	dw Data_11b08
-	dw Data_11b15
-	dw Data_11b22
-	dw Data_11b2f
-	dw Data_11b3c
-	dw Data_11b49
-	dw Data_11b56
-	dw SaraData
-	dw AmandaData
-	dw Data_11b7d
-	dw Data_11b8a
-	dw Data_11b97
-	dw Data_11ba4
-	dw Data_11bb1
-	dw Data_11bbe
-	dw Data_11bcb
-	dw Data_11bd8
-	dw Data_11be5
-	dw Data_11bf2
-	dw Data_11bff
-	dw Data_11c0c
-	dw Data_11c19
-	dw Data_11c26
-	dw Data_11c40
-	dw Data_11c4d
-	dw Data_11c5a
-	dw Data_11c67
-	dw Data_11c74
-	dw Data_11c81
-	dw Data_11c8e
-	dw Data_11c9b
-	dw Data_11ca8
-	dw Data_11cb5
-	dw Data_11cc2
-	dw Data_11ccf
-	dw Data_11cdc
-	dw Data_11ce9
-	dw Data_11cf6
-	dw Data_11d03
-	dw Data_11d10
-	dw Data_11d1d
-	dw Data_11d2a
-	dw Data_11d37
-	dw Data_11d44
-	dw Data_11d51
-	dw Data_11d5e
-	dw Data_11d6b
-	dw Data_11d78
-	dw Data_11d85
-	dw Data_11d92
-	dw Data_11d9f
-	dw Data_11dac
-	dw Data_11db9
-	dw Data_11dc6
-	dw Data_11dd3
-	dw Data_11de0
-	dw Data_11ded
-	dw Data_11dfa
-	dw Data_11e07
-	dw Data_11e14
-	dw Data_11e21
-	dw Data_11e2e
-	dw Data_11e3b
-	dw Data_11e48
-	dw Data_11e55
-	dw Data_11e62
-	dw Data_11e6f
-	dw Data_11e7c
-	dw Data_11e89
-	dw Data_11e96
-	dw Data_11ea3
-	dw Data_11eb0
-	dw Data_11ebd
-	dw Data_11eca
-	dw Data_11ed7
-	dw Data_11ee4
-	dw Data_11ef1
-	dw Data_11efe
-	dw Data_11f0b
-	dw Data_11f18
-	dw Data_11f1f
-	dw Data_11f26
-	dw Data_11f2d
-	dw Data_11f34
-	dw Data_11f3b
-	dw Data_11f42
-	dw Data_11f49
-	dw Data_11f49
-	dw Data_11c33
-	dw Data_119f7
-	dw Data_11a04
-	dw Data_11f49
-Data_119dd:
-	db $01
-	db $02
-	db $00
-	db $26
-	db $00
-	dw $5727 ; Pointer to NPC Data
-	db $ac
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_119ea:
-	db $02
-	db $01
-	db $04
-	db $0e
-	db $00
-	dw $5c4b ; Pointer to NPC Data
-	db $ad
-	db $03
-	db $02
-	db $1a
-	db $0f
-	db $16
-Data_119f7:
-	db $71
-	db $01
-	db $04
-	db $0e
-	db $00
-	dw $5c4b ; Pointer to NPC Data
-	db $ad
-	db $03
-	db $02
-	db $1a
-	db $0f
-	db $16
-Data_11a04:
-	db $72
-	db $01
-	db $04
-	db $0e
-	db $00
-	dw $5c4b ; Pointer to NPC Data
-	db $ad
-	db $03
-	db $02
-	db $1a
-	db $0f
-	db $16
-Data_11a11:
-	db $03
-	db $03
-	db $04
-	db $22
-	db $00
-	dw $5b4a ; Pointer to NPC Data
-	db $ae
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11a1e:
-	db $04
-	db $04
-	db $00
-	db $0e
-	db $00
-	dw $5d0d ; Pointer to NPC Data
-	db $af
-	db $03
-	db $04
-	db $34
-	db $10
-	db $15
-Data_11a2b:
-	db $07
-	db $18
-	db $00
-	db $0e
-	db $00
-	dw $561d ; Pointer to NPC Data
-	db $b1
-	db $03
-	db $03
-	db $02
-	db $02
-	db $15
-Data_11a38:
-	db $08
-	db $18
-	db $00
-	db $0e
-	db $00
-	dw $5583 ; Pointer to NPC Data
-	db $b2
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11a45:
-	db $09
-	db $18
-	db $00
-	db $0e
-	db $00
-	dw $55ca ; Pointer to NPC Data
-	db $b2
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11a52:
-	db $0a
-	db $18
-	db $00
-	db $0e
-	db $00
-	dw $55d5 ; Pointer to NPC Data
-	db $b2
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11a5f:
-	db $0b
-	db $18
-	db $00
-	db $0e
-	db $00
-	dw $55e0 ; Pointer to NPC Data
-	db $b2
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11a6c:
-	db $0c
-	db $18
-	db $00
-	db $0e
-	db $00
-	dw $55f9 ; Pointer to NPC Data
-	db $b2
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11a79:
-	db $0d
-	db $18
-	db $00
-	db $0e
-	db $00
-	dw $58bb ; Pointer to NPC Data
-	db $b2
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11a86:
-	db $0e
-	db $21
-	db $0a
-	db $30
-	db $00
-	dw $5c64 ; Pointer to NPC Data
-	db $b3
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11a93:
-	db $0f
-	db $21
-	db $0a
-	db $30
-	db $00
-	dw $5ed1 ; Pointer to NPC Data
-	db $b3
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11aa0:
-	db $10
-	db $21
-	db $0a
-	db $30
-	db $00
-	dw $609e ; Pointer to NPC Data
-	db $b3
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11aad:
-	db $11
-	db $21
-	db $0a
-	db $30
-	db $00
-	dw $6369 ; Pointer to NPC Data
-	db $b3
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11aba:
-	db $12
-	db $21
-	db $0a
-	db $30
-	db $00
-	dw $6566 ; Pointer to NPC Data
-	db $b3
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11ac7:
-	db $13
-	db $21
-	db $0a
-	db $30
-	db $00
-	dw $684c ; Pointer to NPC Data
-	db $b3
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11ad4:
-	db $14
-	db $21
-	db $0a
-	db $30
-	db $00
-	dw $6b53 ; Pointer to NPC Data
-	db $b3
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11ae1:
-	db $15
-	db $21
-	db $0a
-	db $30
-	db $00
-	dw $6d45 ; Pointer to NPC Data
-	db $b3
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11aee:
-	db $16
-	db $21
-	db $0a
-	db $30
-	db $00
-	dw $7025 ; Pointer to NPC Data
-	db $b3
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11afb:
-	db $17
-	db $15
-	db $00
-	db $26
-	db $00
-	dw $5ef2 ; Pointer to NPC Data
-	db $b4
-	db $03
-	db $1d
-	db $1c
-	db $03
-	db $15
-Data_11b08:
-	db $18
-	db $15
-	db $00
-	db $26
-	db $00
-	dw $6573 ; Pointer to NPC Data
-	db $b5
-	db $03
-	db $1e
-	db $1d
-	db $03
-	db $15
-Data_11b15:
-	db $19
-	db $1f
-	db $04
-	db $1a
-	db $00
-	dw $6d96 ; Pointer to NPC Data
-	db $b6
-	db $03
-	db $27
-	db $1e
-	db $03
-	db $15
-Data_11b22:
-	db $1a
-	db $0a
-	db $00
-	db $0e
-	db $00
-	dw $5dc3 ; Pointer to NPC Data
-	db $b7
-	db $03
-	db $0a
-	db $10
-	db $03
-	db $16
-Data_11b2f:
-	db $1b
-	db $15
-	db $00
-	db $16
-	db $00
-	dw $5f39 ; Pointer to NPC Data
-	db $b8
-	db $03
-	db $1a
-	db $21
-	db $03
-	db $15
-Data_11b3c:
-	db $1c
-	db $11
-	db $00
-	db $26
-	db $00
-	dw $5ff0 ; Pointer to NPC Data
-	db $b9
-	db $03
-	db $1b
-	db $1f
-	db $03
-	db $15
-Data_11b49:
-	db $1d
-	db $1a
-	db $00
-	db $16
-	db $00
-	dw $6017 ; Pointer to NPC Data
-	db $ba
-	db $03
-	db $1c
-	db $20
-	db $03
-	db $15
-Data_11b56:
-	db $1e
-	db $0b
-	db $04
-	db $1e
-	db $00
-	dw $603e ; Pointer to NPC Data
-	db $bb
-	db $03
-	db $0b
-	db $11
-	db $03
-	db $16
-SaraData:
-	db SARA ; trainer id
-	db $20
-	db $00
-	db $0e
-	db $00
-	dw OWSequence_Sara ; Pointer to NPC Data
-	db $bc
-	db $03
-	db SARA_PIC ; battle profile picture
-	db $22
-	db $03
-	db $15
-AmandaData:
-	db AMANDA
-	db $20
-	db $00
-	db $16
-	db $00
-	dw OWSequence_Amanda ; Pointer to NPC Data
-	db $bd
-	db $03
-	db AMANDA_PIC
-	db $23
-	db $03
-	db $15
-Data_11b7d:
-	db $21
-	db $16
-	db $00
-	db $26
-	db $00
-	dw OWSequence_Joshua ; Pointer to NPC Data
-	db $be
-	db $03
-	db $17
-	db $24
-	db $03
-	db $15
-Data_11b8a:
-	db $22
-	db $08
-	db $08
-	db $2e
-	db $10
-	dw $6304 ; Pointer to NPC Data
-	db $bf
-	db $03
-	db $08
-	db $12
-	db $03
-	db $16
-Data_11b97:
-	db $23
-	db $1c
-	db $04
-	db $0e
-	db $00
-	dw $6408 ; Pointer to NPC Data
-	db $c0
-	db $03
-	db $26
-	db $25
-	db $03
-	db $15
-Data_11ba4:
-	db $24
-	db $17
-	db $04
-	db $1e
-	db $00
-	dw $642f ; Pointer to NPC Data
-	db $c1
-	db $03
-	db $18
-	db $26
-	db $03
-	db $15
-Data_11bb1:
-	db $25
-	db $17
-	db $04
-	db $1e
-	db $00
-	dw $6456 ; Pointer to NPC Data
-	db $c2
-	db $03
-	db $19
-	db $27
-	db $03
-	db $15
-Data_11bbe:
-	db $26
-	db $09
-	db $00
-	db $16
-	db $00
-	dw $64ad ; Pointer to NPC Data
-	db $c3
-	db $03
-	db $09
-	db $13
-	db $03
-	db $16
-Data_11bcb:
-	db $27
-	db $1c
-	db $04
-	db $0e
-	db $00
-	dw $65d2 ; Pointer to NPC Data
-	db $c4
-	db $03
-	db $21
-	db $28
-	db $03
-	db $15
-Data_11bd8:
-	db $28
-	db $1e
-	db $00
-	db $1e
-	db $00
-	dw $6701 ; Pointer to NPC Data
-	db $c5
-	db $03
-	db $22
-	db $29
-	db $03
-	db $15
-Data_11be5:
-	db $29
-	db $1d
-	db $04
-	db $22
-	db $00
-	dw $6745 ; Pointer to NPC Data
-	db $c6
-	db $03
-	db $23
-	db $2a
-	db $03
-	db $15
-Data_11bf2:
-	db $2a
-	db $05
-	db $00
-	db $1a
-	db $00
-	dw $679e ; Pointer to NPC Data
-	db $c7
-	db $03
-	db $05
-	db $14
-	db $03
-	db $16
-Data_11bff:
-	db $2b
-	db $11
-	db $04
-	db $16
-	db $00
-	dw $6980 ; Pointer to NPC Data
-	db $c8
-	db $03
-	db $20
-	db $2b
-	db $03
-	db $15
-Data_11c0c:
-	db $2c
-	db $12
-	db $04
-	db $1a
-	db $00
-	dw $6a60 ; Pointer to NPC Data
-	db $c9
-	db $03
-	db $1f
-	db $2c
-	db $03
-	db $15
-Data_11c19:
-	db $2d
-	db $1c
-	db $04
-	db $0e
-	db $00
-	dw $6aa2 ; Pointer to NPC Data
-	db $ca
-	db $03
-	db $28
-	db $2d
-	db $03
-	db $15
-Data_11c26:
-	db $2e
-	db $0c
-	db $00
-	db $12
-	db $00
-	dw $6adf ; Pointer to NPC Data
-	db $cb
-	db $03
-	db $0c
-	db $15
-	db $03
-	db $16
-Data_11c33:
-	db $70
-	db $0c
-	db $03
-	db $15
-	db $10
-	dw $6adf ; Pointer to NPC Data
-	db $cb
-	db $03
-	db $0c
-	db $15
-	db $03
-	db $16
-Data_11c40:
-	db $2f
-	db $18
-	db $00
-	db $0e
-	db $00
-	dw $6cdb ; Pointer to NPC Data
-	db $cc
-	db $03
-	db $11
-	db $2e
-	db $03
-	db $15
-Data_11c4d:
-	db $30
-	db $18
-	db $00
-	db $0e
-	db $00
-	dw $6c11 ; Pointer to NPC Data
-	db $cd
-	db $03
-	db $12
-	db $2f
-	db $03
-	db $15
-Data_11c5a:
-	db $31
-	db $18
-	db $00
-	db $0e
-	db $00
-	dw $6c42 ; Pointer to NPC Data
-	db $ce
-	db $03
-	db $13
-	db $30
-	db $03
-	db $15
-Data_11c67:
-	db $32
-	db $06
-	db $00
-	db $0e
-	db $00
-	dw $6c67 ; Pointer to NPC Data
-	db $cf
-	db $03
-	db $06
-	db $16
-	db $03
-	db $16
-Data_11c74:
-	db $33
-	db $12
-	db $04
-	db $1a
-	db $00
-	dw $6eb3 ; Pointer to NPC Data
-	db $d0
-	db $03
-	db $14
-	db $31
-	db $03
-	db $15
-Data_11c81:
-	db $34
-	db $13
-	db $00
-	db $22
-	db $00
-	dw $6ed8 ; Pointer to NPC Data
-	db $d1
-	db $03
-	db $15
-	db $32
-	db $03
-	db $15
-Data_11c8e:
-	db $35
-	db $11
-	db $04
-	db $16
-	db $00
-	dw $6efd ; Pointer to NPC Data
-	db $d2
-	db $03
-	db $16
-	db $33
-	db $03
-	db $15
-Data_11c9b:
-	db $36
-	db $07
-	db $04
-	db $1e
-	db $00
-	dw $6f22 ; Pointer to NPC Data
-	db $d3
-	db $03
-	db $07
-	db $17
-	db $03
-	db $16
-Data_11ca8:
-	db $37
-	db $0d
-	db $00
-	db $12
-	db $00
-	dw $771f ; Pointer to NPC Data
-	db $d4
-	db $03
-	db $0d
-	db $0c
-	db $04
-	db $17
-Data_11cb5:
-	db $38
-	db $0e
-	db $00
-	db $2a
-	db $00
-	dw $772a ; Pointer to NPC Data
-	db $d5
-	db $03
-	db $0e
-	db $0d
-	db $04
-	db $17
-Data_11cc2:
-	db $39
-	db $0f
-	db $00
-	db $26
-	db $00
-	dw $7735 ; Pointer to NPC Data
-	db $d6
-	db $03
-	db $0f
-	db $0e
-	db $04
-	db $17
-Data_11ccf:
-	db $3a
-	db $10
-	db $00
-	db $0e
-	db $00
-	dw $7740 ; Pointer to NPC Data
-	db $d7
-	db $03
-	db $10
-	db $0f
-	db $04
-	db $17
-Data_11cdc:
-	db $3b
-	db $21
-	db $0a
-	db $30
-	db $00
-	dw $4c3e ; Pointer to NPC Data
-	db $b0
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11ce9:
-	db $3c
-	db $21
-	db $0a
-	db $30
-	db $00
-	dw $4c3e ; Pointer to NPC Data
-	db $b0
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11cf6:
-	db $3d
-	db $1a
-	db $00
-	db $16
-	db $00
-	dw $5c76 ; Pointer to NPC Data
-	db $d8
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11d03:
-	db $3e
-	db $23
-	db $04
-	db $1e
-	db $00
-	dw $5f83 ; Pointer to NPC Data
-	db $d9
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11d10:
-	db $3f
-	db $19
-	db $00
-	db $1a
-	db $00
-	dw $5fc0 ; Pointer to NPC Data
-	db $da
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11d1d:
-	db $40
-	db $22
-	db $00
-	db $16
-	db $00
-	dw $60cf ; Pointer to NPC Data
-	db $db
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11d2a:
-	db $41
-	db $1e
-	db $00
-	db $1e
-	db $00
-	dw $6111 ; Pointer to NPC Data
-	db $dc
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11d37:
-	db $42
-	db $19
-	db $00
-	db $1a
-	db $00
-	dw $639a ; Pointer to NPC Data
-	db $da
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11d44:
-	db $43
-	db $1e
-	db $00
-	db $1e
-	db $00
-	dw $661f ; Pointer to NPC Data
-	db $dc
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11d51:
-	db $44
-	db $1b
-	db $00
-	db $22
-	db $00
-	dw $69a5 ; Pointer to NPC Data
-	db $dd
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11d5e:
-	db $45
-	db $12
-	db $04
-	db $1a
-	db $00
-	dw $6b84 ; Pointer to NPC Data
-	db $de
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11d6b:
-	db $46
-	db $11
-	db $04
-	db $16
-	db $00
-	dw $6e2c ; Pointer to NPC Data
-	db $de
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11d78:
-	db $47
-	db $19
-	db $00
-	db $1a
-	db $00
-	dw $6de8 ; Pointer to NPC Data
-	db $da
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11d85:
-	db $48
-	db $22
-	db $00
-	db $16
-	db $00
-	dw $7295 ; Pointer to NPC Data
-	db $b3
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11d92:
-	db $49
-	db $22
-	db $00
-	db $16
-	db $00
-	dw $726c ; Pointer to NPC Data
-	db $b3
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11d9f:
-	db $4a
-	db $22
-	db $00
-	db $16
-	db $00
-	dw $7352 ; Pointer to NPC Data
-	db $df
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11dac:
-	db $4b
-	db $13
-	db $00
-	db $22
-	db $00
-	dw $5d82 ; Pointer to NPC Data
-	db $e0
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11db9:
-	db $4c
-	db $14
-	db $00
-	db $16
-	db $00
-	dw $5d8d ; Pointer to NPC Data
-	db $e1
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11dc6:
-	db $4d
-	db $24
-	db $00
-	db $16
-	db $00
-	dw $5d9f ; Pointer to NPC Data
-	db $e5
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11dd3:
-	db $4e
-	db $1d
-	db $04
-	db $22
-	db $00
-	dw $5fd2 ; Pointer to NPC Data
-	db $dc
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11de0:
-	db $4f
-	db $1a
-	db $00
-	db $16
-	db $00
-	dw $6137 ; Pointer to NPC Data
-	db $d8
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11ded:
-	db $50
-	db $1b
-	db $00
-	db $22
-	db $00
-	dw $613b ; Pointer to NPC Data
-	db $dd
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11dfa:
-	db $51
-	db $1d
-	db $04
-	db $22
-	db $00
-	dw $63d9 ; Pointer to NPC Data
-	db $dc
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11e07:
-	db $52
-	db $17
-	db $04
-	db $1e
-	db $00
-	dw $63dd ; Pointer to NPC Data
-	db $e2
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11e14:
-	db $53
-	db $24
-	db $00
-	db $16
-	db $00
-	dw $66d8 ; Pointer to NPC Data
-	db $e5
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11e21:
-	db $54
-	db $22
-	db $00
-	db $16
-	db $00
-	dw $66e3 ; Pointer to NPC Data
-	db $db
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11e2e:
-	db $55
-	db $12
-	db $04
-	db $1a
-	db $00
-	dw $6850 ; Pointer to NPC Data
-	db $de
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11e3b:
-	db $56
-	db $22
-	db $00
-	db $16
-	db $00
-	dw $6a30 ; Pointer to NPC Data
-	db $db
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11e48:
-	db $57
-	db $19
-	db $00
-	db $1a
-	db $00
-	dw $6a3b ; Pointer to NPC Data
-	db $da
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11e55:
-	db $58
-	db $1a
-	db $00
-	db $16
-	db $00
-	dw $6bc1 ; Pointer to NPC Data
-	db $d8
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11e62:
-	db $59
-	db $18
-	db $00
-	db $0e
-	db $00
-	dw $6bc5 ; Pointer to NPC Data
-	db $e0
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11e6f:
-	db $5a
-	db $13
-	db $00
-	db $22
-	db $00
-	dw $6bed ; Pointer to NPC Data
-	db $e0
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11e7c:
-	db $5b
-	db $23
-	db $04
-	db $1e
-	db $00
-	dw $4c3e ; Pointer to NPC Data
-	db $d9
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11e89:
-	db $5c
-	db $15
-	db $00
-	db $26
-	db $00
-	dw $6e88 ; Pointer to NPC Data
-	db $e4
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11e96:
-	db $5d
-	db $1b
-	db $00
-	db $22
-	db $00
-	dw $709c ; Pointer to NPC Data
-	db $dd
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11ea3:
-	db $5e
-	db $22
-	db $00
-	db $16
-	db $00
-	dw $70a0 ; Pointer to NPC Data
-	db $db
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11eb0:
-	db $5f
-	db $15
-	db $00
-	db $26
-	db $00
-	dw $70a4 ; Pointer to NPC Data
-	db $e3
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11ebd:
-	db $60
-	db $17
-	db $04
-	db $1e
-	db $00
-	dw $70a8 ; Pointer to NPC Data
-	db $e2
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11eca:
-	db $61
-	db $1f
-	db $04
-	db $1a
-	db $00
-	dw $70ac ; Pointer to NPC Data
-	db $dc
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11ed7:
-	db $62
-	db $19
-	db $00
-	db $1a
-	db $00
-	dw $70b0 ; Pointer to NPC Data
-	db $da
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11ee4:
-	db $63
-	db $18
-	db $00
-	db $0e
-	db $00
-	dw $58dd ; Pointer to NPC Data
-	db $e7
-	db $03
-	db $29
-	db $09
-	db $02
-	db $15
-Data_11ef1:
-	db $64
-	db $1a
-	db $00
-	db $16
-	db $00
-	dw $7283 ; Pointer to NPC Data
-	db $e6
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11efe:
-	db $65
-	db $18
-	db $00
-	db $0e
-	db $00
-	dw $58c6 ; Pointer to NPC Data
-	db $b2
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11f0b:
-	db $66
-	db $18
-	db $00
-	db $0e
-	db $00
-	dw $58d1 ; Pointer to NPC Data
-	db $b2
-	db $03
-	db $00
-	db $00
-	db $00
-	db $00
-Data_11f18:
-	db $67
-	db $26
-	db $3a
-	db $3a
-	db $10
-	dw $4c3e ; Pointer to NPC Data
-Data_11f1f:
-	db $68
-	db $27
-	db $3b
-	db $41
-	db $50
-	dw $4c3e ; Pointer to NPC Data
-Data_11f26:
-	db $69
-	db $27
-	db $3c
-	db $42
-	db $50
-	dw $4c3e ; Pointer to NPC Data
-Data_11f2d:
-	db $6a
-	db $27
-	db $3d
-	db $43
-	db $50
-	dw $4c3e ; Pointer to NPC Data
-Data_11f34:
-	db $6b
-	db $27
-	db $3e
-	db $44
-	db $50
-	dw $4c3e ; Pointer to NPC Data
-Data_11f3b:
-	db $6c
-	db $27
-	db $3f
-	db $45
-	db $50
-	dw $4c3e ; Pointer to NPC Data
-Data_11f42:
-	db $6d
-	db $27
-	db $40
-	db $46
-	db $50
-	dw $4c3e ; Pointer to NPC Data
-Data_11f49:
-	db $00
-	db $00
-	db $00
-	db $1e
-	db $00
diff --git a/src/data/warp_data.asm b/src/data/warp_data.asm
deleted file mode 100755
index cb34721..0000000
--- a/src/data/warp_data.asm
+++ /dev/null
@@ -1,250 +0,0 @@
-WarpDataPointers: ; 1c099 (7:4099)
-	dw $0000
-	dw MasonLaboratoryWarpData
-	dw DeckMachineRoomWarpData
-	dw IshiharasHouseWarpData
-	dw FightingClubEntranceWarpData
-	dw FightingClubLobbyWarpData
-	dw FightingClubWarpData
-	dw RockClubEntranceWarpData
-	dw RockClubLobbyWarpData
-	dw RockClubWarpData
-	dw WaterClubEntranceWarpData
-	dw WaterClubLobbyWarpData
-	dw WaterClubWarpData
-	dw LightningClubEntranceWarpData
-	dw LightningClubLobbyWarpData
-	dw LightningClubWarpData
-	dw GrassClubEntranceWarpData
-	dw GrassClubLobbyWarpData
-	dw GrassClubWarpData
-	dw PsychicClubEntranceWarpData
-	dw PsychicClubLobbyWarpData
-	dw PsychicClubWarpData
-	dw ScienceClubEntranceWarpData
-	dw ScienceClubLobbyWarpData
-	dw ScienceClubWarpData
-	dw FireClubEntranceWarpData
-	dw FireClubLobbyWarpData
-	dw FireClubWarpData
-	dw ChallengeHallEntranceWarpData
-	dw ChallengeHallLobbyWarpData
-	dw ChallengeHallWarpData
-	dw PokemonDomeEntranceWarpData
-	dw PokemonDomeWarpData
-	dw HallOfHonorWarpData
-
-; each warp is five bytes long
-; coordinates are measured in tiles
-; 1: x coordinate of current map
-; 2: y coordinate of current map
-; 3: id of connected map
-; 4: x coordinate of connected map
-; 5: y coordinate of connected map
-; double null terminated
-MasonLaboratoryWarpData: ; 1c0dd (7:40dd)
-	db $0E,$1C,OVERWORLD_MAP,    $00,$00
-	db $10,$1C,OVERWORLD_MAP,    $00,$00
-	db $1A,$0A,DECK_MACHINE_ROOM,$02,$0A
-	db $1A,$0C,DECK_MACHINE_ROOM,$02,$0C
-	db $00,$00
-
-DeckMachineRoomWarpData: ; 1c0f3 (7:40f3)
-	db $00,$0A,MASON_LABORATORY,$18,$0A
-	db $00,$0C,MASON_LABORATORY,$18,$0C
-	db $00,$00
-
-IshiharasHouseWarpData: ; 1c0ff (7:40ff)
-	db $08,$16,OVERWORLD_MAP,$00,$00
-	db $0A,$16,OVERWORLD_MAP,$00,$00
-	db $00,$00
-
-FightingClubEntranceWarpData: ; 1c10b (7:410b)
-	db $08,$10,OVERWORLD_MAP,      $00,$00
-	db $0A,$10,OVERWORLD_MAP,      $00,$00
-	db $00,$06,FIGHTING_CLUB_LOBBY,$18,$0A
-	db $00,$08,FIGHTING_CLUB_LOBBY,$18,$0C
-	db $08,$00,FIGHTING_CLUB,      $0A,$0E
-	db $0A,$00,FIGHTING_CLUB,      $0C,$0E
-	db $00,$00
-
-FightingClubLobbyWarpData: ; 1c12b (7:412b)
-	db $1A,$0A,FIGHTING_CLUB_ENTRANCE,$02,$06
-	db $1A,$0C,FIGHTING_CLUB_ENTRANCE,$02,$08
-	db $00,$00
-
-FightingClubWarpData: ; 1c137 (7:4137)
-	db $0A,$10,FIGHTING_CLUB_ENTRANCE,$08,$02
-	db $0C,$10,FIGHTING_CLUB_ENTRANCE,$0A,$02
-	db $00,$00
-
-RockClubEntranceWarpData: ; 1c143 (7:4143)
-	db $08,$10,OVERWORLD_MAP,  $00,$00
-	db $0A,$10,OVERWORLD_MAP,  $00,$00
-	db $00,$06,ROCK_CLUB_LOBBY,$18,$0A
-	db $00,$08,ROCK_CLUB_LOBBY,$18,$0C
-	db $08,$00,ROCK_CLUB,      $0C,$1A
-	db $0A,$00,ROCK_CLUB,      $0E,$1A
-	db $00,$00
-
-RockClubLobbyWarpData: ; 1c163 (7:4163)
-	db $1A,$0A,ROCK_CLUB_ENTRANCE,$02,$06
-	db $1A,$0C,ROCK_CLUB_ENTRANCE,$02,$08
-	db $00,$00
-
-RockClubWarpData: ; 1c16f (7:416f)
-	db $0C,$1C,ROCK_CLUB_ENTRANCE,$08,$02
-	db $0E,$1C,ROCK_CLUB_ENTRANCE,$0A,$02
-	db $00,$00
-
-WaterClubEntranceWarpData: ; 1c17b (7:417b)
-	db $08,$10,OVERWORLD_MAP,   $00,$00
-	db $0A,$10,OVERWORLD_MAP,   $00,$00
-	db $00,$06,WATER_CLUB_LOBBY,$18,$0A
-	db $00,$08,WATER_CLUB_LOBBY,$18,$0C
-	db $08,$00,WATER_CLUB,      $0C,$1C
-	db $0A,$00,WATER_CLUB,      $0E,$1C
-	db $00,$00
-
-WaterClubLobbyWarpData: ; 1c19b (7:419b)
-	db $1A,$0A,WATER_CLUB_ENTRANCE,$02,$06
-	db $1A,$0C,WATER_CLUB_ENTRANCE,$02,$08
-	db $00,$00
-
-WaterClubWarpData: ; 1c1a7 (7:41a7)
-	db $0C,$1E,WATER_CLUB_ENTRANCE,$08,$02
-	db $0E,$1E,WATER_CLUB_ENTRANCE,$0A,$02
-	db $00,$00
-
-LightningClubEntranceWarpData: ; 1c1b3 (7:41b3)
-	db $08,$10,OVERWORLD_MAP,       $00,$00
-	db $0A,$10,OVERWORLD_MAP,       $00,$00
-	db $00,$06,LIGHTNING_CLUB_LOBBY,$18,$0A
-	db $00,$08,LIGHTNING_CLUB_LOBBY,$18,$0C
-	db $08,$00,LIGHTNING_CLUB,      $0C,$1C
-	db $0A,$00,LIGHTNING_CLUB,      $0E,$1C
-	db $00,$00
-
-LightningClubLobbyWarpData: ; 1c1d3 (7:41d3)
-	db $1A,$0A,LIGHTNING_CLUB_ENTRANCE,$02,$06
-	db $1A,$0C,LIGHTNING_CLUB_ENTRANCE,$02,$08
-	db $00,$00
-
-LightningClubWarpData: ; 1c1df (7:41df)
-	db $0C,$1E,LIGHTNING_CLUB_ENTRANCE,$08,$02
-	db $0E,$1E,LIGHTNING_CLUB_ENTRANCE,$0A,$02
-	db $00,$00
-
-GrassClubEntranceWarpData: ; 1c1eb (7:41eb)
-	db $08,$10,OVERWORLD_MAP,   $00,$00
-	db $0A,$10,OVERWORLD_MAP,   $00,$00
-	db $00,$06,GRASS_CLUB_LOBBY,$18,$0A
-	db $00,$08,GRASS_CLUB_LOBBY,$18,$0C
-	db $08,$00,GRASS_CLUB,      $0C,$1C
-	db $0A,$00,GRASS_CLUB,      $0E,$1C
-	db $00,$00
-
-GrassClubLobbyWarpData: ; 1c20b (7:420b)
-	db $1A,$0A,GRASS_CLUB_ENTRANCE,$02,$06
-	db $1A,$0C,GRASS_CLUB_ENTRANCE,$02,$08
-	db $00,$00
-
-GrassClubWarpData: ; 1c217 (7:4217)
-	db $0C,$1E,GRASS_CLUB_ENTRANCE,$08,$02
-	db $0E,$1E,GRASS_CLUB_ENTRANCE,$0A,$02
-	db $00,$00
-
-PsychicClubEntranceWarpData: ; 1c223 (7:4223)
-	db $08,$10,OVERWORLD_MAP,     $00,$00
-	db $0A,$10,OVERWORLD_MAP,     $00,$00
-	db $00,$06,PSYCHIC_CLUB_LOBBY,$18,$0A
-	db $00,$08,PSYCHIC_CLUB_LOBBY,$18,$0C
-	db $08,$00,PSYCHIC_CLUB,      $0C,$18
-	db $0A,$00,PSYCHIC_CLUB,      $0E,$18
-	db $00,$00
-
-PsychicClubLobbyWarpData: ; 1c243 (7:4243)
-	db $1A,$0A,PSYCHIC_CLUB_ENTRANCE,$02,$06
-	db $1A,$0C,PSYCHIC_CLUB_ENTRANCE,$02,$08
-	db $00,$00
-
-PsychicClubWarpData: ; 1c24f (7:424f)
-	db $0C,$1A,PSYCHIC_CLUB_ENTRANCE,$08,$02
-	db $0E,$1A,PSYCHIC_CLUB_ENTRANCE,$0A,$02
-	db $00,$00
-
-ScienceClubEntranceWarpData: ; 1c25b (7:425b)
-	db $08,$10,OVERWORLD_MAP,     $00,$00
-	db $0A,$10,OVERWORLD_MAP,     $00,$00
-	db $00,$06,SCIENCE_CLUB_LOBBY,$18,$0A
-	db $00,$08,SCIENCE_CLUB_LOBBY,$18,$0C
-	db $08,$00,SCIENCE_CLUB,      $0C,$1C
-	db $0A,$00,SCIENCE_CLUB,      $0E,$1C
-	db $00,$00
-
-ScienceClubLobbyWarpData: ; 1c27b (7:427b)
-	db $1A,$0A,SCIENCE_CLUB_ENTRANCE,$02,$06
-	db $1A,$0C,SCIENCE_CLUB_ENTRANCE,$02,$08
-	db $00,$00
-
-ScienceClubWarpData: ; 1c287 (7:4287)
-	db $0C,$1E,SCIENCE_CLUB_ENTRANCE,$08,$02
-	db $0E,$1E,SCIENCE_CLUB_ENTRANCE,$0A,$02
-	db $00,$00
-
-FireClubEntranceWarpData: ; 1c293 (7:4293)
-	db $08,$10,OVERWORLD_MAP,  $00,$00
-	db $0A,$10,OVERWORLD_MAP,  $00,$00
-	db $00,$06,FIRE_CLUB_LOBBY,$18,$0A
-	db $00,$08,FIRE_CLUB_LOBBY,$18,$0C
-	db $08,$00,FIRE_CLUB,      $0C,$1C
-	db $0A,$00,FIRE_CLUB,      $0E,$1C
-	db $00,$00
-
-FireClubLobbyWarpData: ; 1c2b3 (7:42b3)
-	db $1A,$0A,FIRE_CLUB_ENTRANCE,$02,$06
-	db $1A,$0C,FIRE_CLUB_ENTRANCE,$02,$08
-	db $00,$00
-
-FireClubWarpData: ; 1c2bf (7:42bf)
-	db $0C,$1E,FIRE_CLUB_ENTRANCE,$08,$02
-	db $0E,$1E,FIRE_CLUB_ENTRANCE,$0A,$02
-	db $00,$00
-
-ChallengeHallEntranceWarpData: ; 1c2cb (7:42cb)
-	db $08,$10,OVERWORLD_MAP,       $00,$00
-	db $0A,$10,OVERWORLD_MAP,       $00,$00
-	db $00,$06,CHALLENGE_HALL_LOBBY,$18,$0A
-	db $00,$08,CHALLENGE_HALL_LOBBY,$18,$0C
-	db $08,$00,CHALLENGE_HALL,      $0E,$1C
-	db $0A,$00,CHALLENGE_HALL,      $10,$1C
-	db $00,$00
-
-ChallengeHallLobbyWarpData: ; 1c2eb (7:42eb)
-	db $1A,$0A,CHALLENGE_HALL_ENTRANCE,$02,$06
-	db $1A,$0C,CHALLENGE_HALL_ENTRANCE,$02,$08
-	db $00,$00
-
-ChallengeHallWarpData: ; 1c2f7 (7:42f7)
-	db $0E,$1E,CHALLENGE_HALL_ENTRANCE,$08,$02
-	db $10,$1E,CHALLENGE_HALL_ENTRANCE,$0A,$02
-	db $00,$00
-
-PokemonDomeEntranceWarpData: ; 1c303 (7:4303)
-	db $0E,$10,OVERWORLD_MAP,$00,$00
-	db $10,$10,OVERWORLD_MAP,$00,$00
-	db $16,$00,POKEMON_DOME, $0E,$1C
-	db $18,$00,POKEMON_DOME, $10,$1C
-	db $00,$00
-
-PokemonDomeWarpData: ; 1c319 (7:4319)
-	db $0E,$1E,POKEMON_DOME_ENTRANCE,$16,$02
-	db $10,$1E,POKEMON_DOME_ENTRANCE,$18,$02
-	db $0E,$00,HALL_OF_HONOR,        $0A,$16
-	db $10,$00,HALL_OF_HONOR,        $0C,$16
-	db $00,$00
-
-HallOfHonorWarpData: ; 1c32f (7:432f)
-	db $0A,$18,POKEMON_DOME,$0E,$02
-	db $0C,$18,POKEMON_DOME,$10,$02
-	db $00,$00
diff --git a/src/data/warps.asm b/src/data/warps.asm
new file mode 100644
index 0000000..cb34721
--- /dev/null
+++ b/src/data/warps.asm
@@ -0,0 +1,250 @@
+WarpDataPointers: ; 1c099 (7:4099)
+	dw $0000
+	dw MasonLaboratoryWarpData
+	dw DeckMachineRoomWarpData
+	dw IshiharasHouseWarpData
+	dw FightingClubEntranceWarpData
+	dw FightingClubLobbyWarpData
+	dw FightingClubWarpData
+	dw RockClubEntranceWarpData
+	dw RockClubLobbyWarpData
+	dw RockClubWarpData
+	dw WaterClubEntranceWarpData
+	dw WaterClubLobbyWarpData
+	dw WaterClubWarpData
+	dw LightningClubEntranceWarpData
+	dw LightningClubLobbyWarpData
+	dw LightningClubWarpData
+	dw GrassClubEntranceWarpData
+	dw GrassClubLobbyWarpData
+	dw GrassClubWarpData
+	dw PsychicClubEntranceWarpData
+	dw PsychicClubLobbyWarpData
+	dw PsychicClubWarpData
+	dw ScienceClubEntranceWarpData
+	dw ScienceClubLobbyWarpData
+	dw ScienceClubWarpData
+	dw FireClubEntranceWarpData
+	dw FireClubLobbyWarpData
+	dw FireClubWarpData
+	dw ChallengeHallEntranceWarpData
+	dw ChallengeHallLobbyWarpData
+	dw ChallengeHallWarpData
+	dw PokemonDomeEntranceWarpData
+	dw PokemonDomeWarpData
+	dw HallOfHonorWarpData
+
+; each warp is five bytes long
+; coordinates are measured in tiles
+; 1: x coordinate of current map
+; 2: y coordinate of current map
+; 3: id of connected map
+; 4: x coordinate of connected map
+; 5: y coordinate of connected map
+; double null terminated
+MasonLaboratoryWarpData: ; 1c0dd (7:40dd)
+	db $0E,$1C,OVERWORLD_MAP,    $00,$00
+	db $10,$1C,OVERWORLD_MAP,    $00,$00
+	db $1A,$0A,DECK_MACHINE_ROOM,$02,$0A
+	db $1A,$0C,DECK_MACHINE_ROOM,$02,$0C
+	db $00,$00
+
+DeckMachineRoomWarpData: ; 1c0f3 (7:40f3)
+	db $00,$0A,MASON_LABORATORY,$18,$0A
+	db $00,$0C,MASON_LABORATORY,$18,$0C
+	db $00,$00
+
+IshiharasHouseWarpData: ; 1c0ff (7:40ff)
+	db $08,$16,OVERWORLD_MAP,$00,$00
+	db $0A,$16,OVERWORLD_MAP,$00,$00
+	db $00,$00
+
+FightingClubEntranceWarpData: ; 1c10b (7:410b)
+	db $08,$10,OVERWORLD_MAP,      $00,$00
+	db $0A,$10,OVERWORLD_MAP,      $00,$00
+	db $00,$06,FIGHTING_CLUB_LOBBY,$18,$0A
+	db $00,$08,FIGHTING_CLUB_LOBBY,$18,$0C
+	db $08,$00,FIGHTING_CLUB,      $0A,$0E
+	db $0A,$00,FIGHTING_CLUB,      $0C,$0E
+	db $00,$00
+
+FightingClubLobbyWarpData: ; 1c12b (7:412b)
+	db $1A,$0A,FIGHTING_CLUB_ENTRANCE,$02,$06
+	db $1A,$0C,FIGHTING_CLUB_ENTRANCE,$02,$08
+	db $00,$00
+
+FightingClubWarpData: ; 1c137 (7:4137)
+	db $0A,$10,FIGHTING_CLUB_ENTRANCE,$08,$02
+	db $0C,$10,FIGHTING_CLUB_ENTRANCE,$0A,$02
+	db $00,$00
+
+RockClubEntranceWarpData: ; 1c143 (7:4143)
+	db $08,$10,OVERWORLD_MAP,  $00,$00
+	db $0A,$10,OVERWORLD_MAP,  $00,$00
+	db $00,$06,ROCK_CLUB_LOBBY,$18,$0A
+	db $00,$08,ROCK_CLUB_LOBBY,$18,$0C
+	db $08,$00,ROCK_CLUB,      $0C,$1A
+	db $0A,$00,ROCK_CLUB,      $0E,$1A
+	db $00,$00
+
+RockClubLobbyWarpData: ; 1c163 (7:4163)
+	db $1A,$0A,ROCK_CLUB_ENTRANCE,$02,$06
+	db $1A,$0C,ROCK_CLUB_ENTRANCE,$02,$08
+	db $00,$00
+
+RockClubWarpData: ; 1c16f (7:416f)
+	db $0C,$1C,ROCK_CLUB_ENTRANCE,$08,$02
+	db $0E,$1C,ROCK_CLUB_ENTRANCE,$0A,$02
+	db $00,$00
+
+WaterClubEntranceWarpData: ; 1c17b (7:417b)
+	db $08,$10,OVERWORLD_MAP,   $00,$00
+	db $0A,$10,OVERWORLD_MAP,   $00,$00
+	db $00,$06,WATER_CLUB_LOBBY,$18,$0A
+	db $00,$08,WATER_CLUB_LOBBY,$18,$0C
+	db $08,$00,WATER_CLUB,      $0C,$1C
+	db $0A,$00,WATER_CLUB,      $0E,$1C
+	db $00,$00
+
+WaterClubLobbyWarpData: ; 1c19b (7:419b)
+	db $1A,$0A,WATER_CLUB_ENTRANCE,$02,$06
+	db $1A,$0C,WATER_CLUB_ENTRANCE,$02,$08
+	db $00,$00
+
+WaterClubWarpData: ; 1c1a7 (7:41a7)
+	db $0C,$1E,WATER_CLUB_ENTRANCE,$08,$02
+	db $0E,$1E,WATER_CLUB_ENTRANCE,$0A,$02
+	db $00,$00
+
+LightningClubEntranceWarpData: ; 1c1b3 (7:41b3)
+	db $08,$10,OVERWORLD_MAP,       $00,$00
+	db $0A,$10,OVERWORLD_MAP,       $00,$00
+	db $00,$06,LIGHTNING_CLUB_LOBBY,$18,$0A
+	db $00,$08,LIGHTNING_CLUB_LOBBY,$18,$0C
+	db $08,$00,LIGHTNING_CLUB,      $0C,$1C
+	db $0A,$00,LIGHTNING_CLUB,      $0E,$1C
+	db $00,$00
+
+LightningClubLobbyWarpData: ; 1c1d3 (7:41d3)
+	db $1A,$0A,LIGHTNING_CLUB_ENTRANCE,$02,$06
+	db $1A,$0C,LIGHTNING_CLUB_ENTRANCE,$02,$08
+	db $00,$00
+
+LightningClubWarpData: ; 1c1df (7:41df)
+	db $0C,$1E,LIGHTNING_CLUB_ENTRANCE,$08,$02
+	db $0E,$1E,LIGHTNING_CLUB_ENTRANCE,$0A,$02
+	db $00,$00
+
+GrassClubEntranceWarpData: ; 1c1eb (7:41eb)
+	db $08,$10,OVERWORLD_MAP,   $00,$00
+	db $0A,$10,OVERWORLD_MAP,   $00,$00
+	db $00,$06,GRASS_CLUB_LOBBY,$18,$0A
+	db $00,$08,GRASS_CLUB_LOBBY,$18,$0C
+	db $08,$00,GRASS_CLUB,      $0C,$1C
+	db $0A,$00,GRASS_CLUB,      $0E,$1C
+	db $00,$00
+
+GrassClubLobbyWarpData: ; 1c20b (7:420b)
+	db $1A,$0A,GRASS_CLUB_ENTRANCE,$02,$06
+	db $1A,$0C,GRASS_CLUB_ENTRANCE,$02,$08
+	db $00,$00
+
+GrassClubWarpData: ; 1c217 (7:4217)
+	db $0C,$1E,GRASS_CLUB_ENTRANCE,$08,$02
+	db $0E,$1E,GRASS_CLUB_ENTRANCE,$0A,$02
+	db $00,$00
+
+PsychicClubEntranceWarpData: ; 1c223 (7:4223)
+	db $08,$10,OVERWORLD_MAP,     $00,$00
+	db $0A,$10,OVERWORLD_MAP,     $00,$00
+	db $00,$06,PSYCHIC_CLUB_LOBBY,$18,$0A
+	db $00,$08,PSYCHIC_CLUB_LOBBY,$18,$0C
+	db $08,$00,PSYCHIC_CLUB,      $0C,$18
+	db $0A,$00,PSYCHIC_CLUB,      $0E,$18
+	db $00,$00
+
+PsychicClubLobbyWarpData: ; 1c243 (7:4243)
+	db $1A,$0A,PSYCHIC_CLUB_ENTRANCE,$02,$06
+	db $1A,$0C,PSYCHIC_CLUB_ENTRANCE,$02,$08
+	db $00,$00
+
+PsychicClubWarpData: ; 1c24f (7:424f)
+	db $0C,$1A,PSYCHIC_CLUB_ENTRANCE,$08,$02
+	db $0E,$1A,PSYCHIC_CLUB_ENTRANCE,$0A,$02
+	db $00,$00
+
+ScienceClubEntranceWarpData: ; 1c25b (7:425b)
+	db $08,$10,OVERWORLD_MAP,     $00,$00
+	db $0A,$10,OVERWORLD_MAP,     $00,$00
+	db $00,$06,SCIENCE_CLUB_LOBBY,$18,$0A
+	db $00,$08,SCIENCE_CLUB_LOBBY,$18,$0C
+	db $08,$00,SCIENCE_CLUB,      $0C,$1C
+	db $0A,$00,SCIENCE_CLUB,      $0E,$1C
+	db $00,$00
+
+ScienceClubLobbyWarpData: ; 1c27b (7:427b)
+	db $1A,$0A,SCIENCE_CLUB_ENTRANCE,$02,$06
+	db $1A,$0C,SCIENCE_CLUB_ENTRANCE,$02,$08
+	db $00,$00
+
+ScienceClubWarpData: ; 1c287 (7:4287)
+	db $0C,$1E,SCIENCE_CLUB_ENTRANCE,$08,$02
+	db $0E,$1E,SCIENCE_CLUB_ENTRANCE,$0A,$02
+	db $00,$00
+
+FireClubEntranceWarpData: ; 1c293 (7:4293)
+	db $08,$10,OVERWORLD_MAP,  $00,$00
+	db $0A,$10,OVERWORLD_MAP,  $00,$00
+	db $00,$06,FIRE_CLUB_LOBBY,$18,$0A
+	db $00,$08,FIRE_CLUB_LOBBY,$18,$0C
+	db $08,$00,FIRE_CLUB,      $0C,$1C
+	db $0A,$00,FIRE_CLUB,      $0E,$1C
+	db $00,$00
+
+FireClubLobbyWarpData: ; 1c2b3 (7:42b3)
+	db $1A,$0A,FIRE_CLUB_ENTRANCE,$02,$06
+	db $1A,$0C,FIRE_CLUB_ENTRANCE,$02,$08
+	db $00,$00
+
+FireClubWarpData: ; 1c2bf (7:42bf)
+	db $0C,$1E,FIRE_CLUB_ENTRANCE,$08,$02
+	db $0E,$1E,FIRE_CLUB_ENTRANCE,$0A,$02
+	db $00,$00
+
+ChallengeHallEntranceWarpData: ; 1c2cb (7:42cb)
+	db $08,$10,OVERWORLD_MAP,       $00,$00
+	db $0A,$10,OVERWORLD_MAP,       $00,$00
+	db $00,$06,CHALLENGE_HALL_LOBBY,$18,$0A
+	db $00,$08,CHALLENGE_HALL_LOBBY,$18,$0C
+	db $08,$00,CHALLENGE_HALL,      $0E,$1C
+	db $0A,$00,CHALLENGE_HALL,      $10,$1C
+	db $00,$00
+
+ChallengeHallLobbyWarpData: ; 1c2eb (7:42eb)
+	db $1A,$0A,CHALLENGE_HALL_ENTRANCE,$02,$06
+	db $1A,$0C,CHALLENGE_HALL_ENTRANCE,$02,$08
+	db $00,$00
+
+ChallengeHallWarpData: ; 1c2f7 (7:42f7)
+	db $0E,$1E,CHALLENGE_HALL_ENTRANCE,$08,$02
+	db $10,$1E,CHALLENGE_HALL_ENTRANCE,$0A,$02
+	db $00,$00
+
+PokemonDomeEntranceWarpData: ; 1c303 (7:4303)
+	db $0E,$10,OVERWORLD_MAP,$00,$00
+	db $10,$10,OVERWORLD_MAP,$00,$00
+	db $16,$00,POKEMON_DOME, $0E,$1C
+	db $18,$00,POKEMON_DOME, $10,$1C
+	db $00,$00
+
+PokemonDomeWarpData: ; 1c319 (7:4319)
+	db $0E,$1E,POKEMON_DOME_ENTRANCE,$16,$02
+	db $10,$1E,POKEMON_DOME_ENTRANCE,$18,$02
+	db $0E,$00,HALL_OF_HONOR,        $0A,$16
+	db $10,$00,HALL_OF_HONOR,        $0C,$16
+	db $00,$00
+
+HallOfHonorWarpData: ; 1c32f (7:432f)
+	db $0A,$18,POKEMON_DOME,$0E,$02
+	db $0C,$18,POKEMON_DOME,$10,$02
+	db $00,$00
-- 
cgit v1.2.3


From 716d5c5e521be2310e62e5d6a01f751428b7c190 Mon Sep 17 00:00:00 2001
From: xCrystal <rgr.crystal@gmail.com>
Date: Wed, 7 Feb 2018 13:54:19 +0100
Subject: More home disassembly

---
 src/data/cards.asm | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/data')

diff --git a/src/data/cards.asm b/src/data/cards.asm
index c93a533..a316554 100755
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@@ -1,3 +1,6 @@
+; TODO: Make card data structures more compact and rearrange the fields for
+; convenience once the meaning of all fields is figured out.
+
 CardPointers: ; 30c5c (c:4c5c)
 	dw $0000
 	dw GrassEnergyCard
-- 
cgit v1.2.3


From acc23e78e00b131efcddac17b55dceed9a199ff2 Mon Sep 17 00:00:00 2001
From: xCrystal <rgr.crystal@gmail.com>
Date: Wed, 7 Feb 2018 17:28:14 +0100
Subject: More home disasm and misc

---
 src/data/cards.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/data')

diff --git a/src/data/cards.asm b/src/data/cards.asm
index a316554..d8dc226 100755
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@@ -10222,5 +10222,5 @@ RecycleCard: ; 33fd3 (c:7fd3)
 	dw NONE ; description (cont)
 
 rept $1f
-db $ff
+	db $ff
 endr
-- 
cgit v1.2.3


From b9f2f4ee8e9218436b7ce36804bf404901f87d0f Mon Sep 17 00:00:00 2001
From: xCrystal <rgr.crystal@gmail.com>
Date: Wed, 7 Feb 2018 20:18:24 +0100
Subject: Use const to enumerate constants

---
 src/data/decks.asm | 208 ++++++++++++++++++++---------------------------------
 1 file changed, 78 insertions(+), 130 deletions(-)

(limited to 'src/data')

diff --git a/src/data/decks.asm b/src/data/decks.asm
index 78b549d..129b6d9 100755
--- a/src/data/decks.asm
+++ b/src/data/decks.asm
@@ -76,7 +76,7 @@ UnnamedDeck: ; 30070 (c:4070)
 	db 1, DEVOLUTION_SPRAY
 	db 1, POTION
 	db 1, SUPER_POTION
-	db 0
+	db 0 ; end
 
 ; 30097 (c:4097)
 	db 8, LIGHTNING_ENERGY
@@ -92,7 +92,7 @@ UnnamedDeck: ; 30070 (c:4070)
 	db 4, BULBASAUR
 	db 4, IVYSAUR
 	db 4, POKEMON_BREEDER
-	db 0
+	db 0 ; end
 
 ; 300b2 (c:40b2)
 	db 24, FIRE_ENERGY
@@ -111,7 +111,7 @@ UnnamedDeck: ; 30070 (c:4070)
 	db 1, POTION
 	db 1, SUPER_POTION
 	db 4, POKEMON_BREEDER
-	db 0
+	db 0 ; end
 
 ; 300d3 (c:40d3)
 	db 4, PSYCHIC_ENERGY
@@ -129,7 +129,7 @@ UnnamedDeck: ; 30070 (c:4070)
 	db 4, PIDGEOT2
 	db 4, JIGGLYPUFF2
 	db 4, POKEMON_BREEDER
-	db 0
+	db 0 ; end
 
 ; 300f2 (c:40f2)
 	db 10, PSYCHIC_ENERGY
@@ -153,7 +153,7 @@ UnnamedDeck: ; 30070 (c:4070)
 	db 1, PROFESSOR_OAK
 	db 2, POKEMON_BREEDER
 	db 2, BILL
-	db 0
+	db 0 ; end
 
 ; 3011d (c:411d)
 	db 10, PSYCHIC_ENERGY
@@ -168,7 +168,7 @@ UnnamedDeck: ; 30070 (c:4070)
 	db 4, HAUNTER1
 	db 4, GENGAR
 	db 4, POKEMON_BREEDER
-	db 0
+	db 0 ; end
 
 ; 30136 (c:4136)
 	db 24, FIRE_ENERGY
@@ -183,7 +183,7 @@ UnnamedDeck: ; 30070 (c:4070)
 	db 2, SCOOP_UP
 	db 1, POTION
 	db 1, SUPER_POTION
-	db 0
+	db 0 ; end
 
 ; 3014f (c:414f)
 	db 20, PSYCHIC_ENERGY
@@ -197,7 +197,7 @@ UnnamedDeck: ; 30070 (c:4070)
 	db 4, GENGAR
 	db 4, MEW3
 	db 4, POKEMON_BREEDER
-	db 0
+	db 0 ; end
 
 ; 30166 (c:4166)
 	db 24, PSYCHIC_ENERGY
@@ -210,7 +210,7 @@ UnnamedDeck: ; 30070 (c:4070)
 	db 4, PORYGON
 	db 4, VENONAT
 	db 4, VENOMOTH
-	db 0
+	db 0 ; end
 
 ; 3017b (c:417b)
 	db 24, PSYCHIC_ENERGY
@@ -225,7 +225,7 @@ UnnamedDeck: ; 30070 (c:4070)
 	db 2, SCOOP_UP
 	db 1, POTION
 	db 1, SUPER_POTION
-	db 0
+	db 0 ; end
 
 ; 30194 (c:4194)
 	db 24, PSYCHIC_ENERGY
@@ -241,7 +241,7 @@ UnnamedDeck: ; 30070 (c:4070)
 	db 2, SCOOP_UP
 	db 1, POTION
 	db 1, SUPER_POTION
-	db 0
+	db 0 ; end
 
 ; 301af (c:41af)
 	db 12, LIGHTNING_ENERGY
@@ -257,7 +257,7 @@ UnnamedDeck: ; 30070 (c:4070)
 	db 4, PIKACHU1
 	db 4, PIKACHU2
 	db 4, RAICHU1
-	db 0
+	db 0 ; end
 
 ; 301ca (c:41ca)
 	db 24, FIGHTING_ENERGY
@@ -274,7 +274,7 @@ UnnamedDeck: ; 30070 (c:4070)
 	db 2, SCOOP_UP
 	db 1, POTION
 	db 1, SUPER_POTION
-	db 0
+	db 0 ; end
 
 UnnamedDeck2: ; 301e7 (c:41e7)
 	db 4, FIRE_ENERGY
@@ -294,7 +294,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
 	db 2, PROFESSOR_OAK
 	db 2, GUST_OF_WIND
 	db 2, DOUBLE_COLORLESS_ENERGY
-	db 0
+	db 0 ; end
 
 ; 3020a (c:420a)
 	db 4, FIRE_ENERGY
@@ -312,7 +312,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
 	db 2, PROFESSOR_OAK
 	db 2, GUST_OF_WIND
 	db 2, DOUBLE_COLORLESS_ENERGY
-	db 0
+	db 0 ; end
 
 ; 30229 (c:4229)
 	db 4, PSYCHIC_ENERGY
@@ -330,7 +330,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
 	db 4, PIDGEOT1
 	db 4, JIGGLYPUFF2
 	db 4, POKEMON_BREEDER
-	db 0
+	db 0 ; end
 
 ; 30248 (c:4248)
 	db 24, GRASS_ENERGY
@@ -343,7 +343,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
 	db 4, JIGGLYPUFF3
 	db 4, WEEDLE
 	db 4, AERODACTYL
-	db 0
+	db 0 ; end
 
 ; 3025d (c:425d)
 	db 8, LIGHTNING_ENERGY
@@ -359,7 +359,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
 	db 4, BULBASAUR
 	db 4, IVYSAUR
 	db 4, POKEMON_BREEDER
-	db 0
+	db 0 ; end
 
 ; 30278 (c:4278)
 	db 24, FIRE_ENERGY
@@ -372,7 +372,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
 	db 4, ARTICUNO2
 	db 4, VAPOREON1
 	db 4, POKEMON_BREEDER
-	db 0
+	db 0 ; end
 
 ; 3028d (c:428d)
 	db 20, GRASS_ENERGY
@@ -386,7 +386,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
 	db 4, BULBASAUR
 	db 4, IVYSAUR
 	db 4, VENUSAUR2
-	db 0
+	db 0 ; end
 
 ; 302a4 (c:42a4)
 	db 24, GRASS_ENERGY
@@ -399,7 +399,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
 	db 4, PARAS
 	db 4, JIGGLYPUFF3
 	db 4, WEEDLE
-	db 0
+	db 0 ; end
 
 ; 302b9 (c:42b9)
 	db 24, WATER_ENERGY
@@ -412,7 +412,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
 	db 4, TENTACOOL
 	db 4, AERODACTYL
 	db 4, POKEMON_BREEDER
-	db 0
+	db 0 ; end
 
 ; 302ce (c:42ce)
 	db 24, WATER_ENERGY
@@ -425,7 +425,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
 	db 4, MYSTERIOUS_FOSSIL
 	db 4, AERODACTYL
 	db 4, POTION
-	db 0
+	db 0 ; end
 
 ; 302e3 (c:42e3)
 	db 24, GRASS_ENERGY
@@ -439,7 +439,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
 	db 3, PLUSPOWER
 	db 2, PROFESSOR_OAK
 	db 3, BILL
-	db 0
+	db 0 ; end
 
 ; 302fa (c:42fa)
 	db 12, LIGHTNING_ENERGY
@@ -455,7 +455,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
 	db 4, PIKACHU1
 	db 4, PIKACHU2
 	db 4, RAICHU1
-	db 0
+	db 0 ; end
 
 ; 30315 (c:4315)
 	db 4, RAICHU2
@@ -471,7 +471,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
 	db 4, KINGLER
 	db 4, KRABBY
 	db 4, MAGIKARP
-	db 0
+	db 0 ; end
 
 ; 30330 (c:4330)
 	dw $4544
@@ -541,8 +541,7 @@ PracticePlayerDeck: ; 30344 (c:4344)
 	db 1, RATICATE
 	db 1, RATICATE
 	db 1, ALAKAZAM
-	db 0
-
+	db 0 ; end
 	tx PracticePlayerDeckName
 
 SamsPracticeDeck: ; 303b5 (c:43b5)
@@ -602,8 +601,7 @@ SamsPracticeDeck: ; 303b5 (c:43b5)
 	db 1, RATTATA
 	db 1, EEVEE
 	db 1, EEVEE
-	db 0
-
+	db 0 ; end
 	tx SamsPracticeDeckName
 
 CharmanderAndFriendsDeck: ; 30428 (c:4428)
@@ -636,8 +634,7 @@ CharmanderAndFriendsDeck: ; 30428 (c:4428)
 	db 1, PLUSPOWER
 	db 2, POTION
 	db 2, FULL_HEAL
-	db 0
-
+	db 0 ; end
 	tx CharmanderAndFriendsDeckName
 
 CharmanderExtraDeck: ; 30465 (c:4465)
@@ -659,8 +656,7 @@ CharmanderExtraDeck: ; 30465 (c:4465)
 	db 1, KADABRA
 	db 1, GASTLY1
 	db 30, GRASS_ENERGY
-	db 0
-
+	db 0 ; end
 	tx CharmanderExtraDeckName
 
 SquirtleAndFriendsDeck: ; 3048c (c:448c)
@@ -696,8 +692,7 @@ SquirtleAndFriendsDeck: ; 3048c (c:448c)
 	db 1, ITEM_FINDER
 	db 1, POTION
 	db 1, FULL_HEAL
-	db 0
-
+	db 0 ; end
 	tx SquirtleAndFriendsDeckName
 
 SquirtleExtraDeck: ; 304cf (c:44cf)
@@ -721,8 +716,7 @@ SquirtleExtraDeck: ; 304cf (c:44cf)
 	db 1, MAGNETON1
 	db 1, ELECTABUZZ2
 	db 30, GRASS_ENERGY
-	db 0
-
+	db 0 ; end
 	tx SquirtleExtraDeckName
 
 BulbasaurAndFriendsDeck: ; 304fa (c:44fa)
@@ -757,8 +751,7 @@ BulbasaurAndFriendsDeck: ; 304fa (c:44fa)
 	db 1, DEFENDER
 	db 2, FULL_HEAL
 	db 1, REVIVE
-	db 0
-
+	db 0 ; end
 	tx BulbasaurAndFriendsDeckName
 
 BulbasaurExtraDeck: ; 3053b (c:453b)
@@ -781,8 +774,7 @@ BulbasaurExtraDeck: ; 3053b (c:453b)
 	db 2, POTION
 	db 1, GUST_OF_WIND
 	db 30, GRASS_ENERGY
-	db 0
-
+	db 0 ; end
 	tx BulbasaurExtraDeckName
 
 LightningAndFireDeck: ; 30564 (c:4564)
@@ -815,8 +807,7 @@ LightningAndFireDeck: ; 30564 (c:4564)
 	db 2, PLUSPOWER
 	db 2, DEFENDER
 	db 1, POTION
-	db 0
-
+	db 0 ; end
 	tx LightningAndFireDeckName
 
 WaterAndFightingDeck: ; 305a1 (c:45a1)
@@ -845,8 +836,7 @@ WaterAndFightingDeck: ; 305a1 (c:45a1)
 	db 2, ENERGY_SEARCH
 	db 3, POTION
 	db 2, FULL_HEAL
-	db 0
-
+	db 0 ; end
 	tx WaterAndFightingDeckName
 
 GrassAndPsychicDeck: ; 305d6 (c:45d6)
@@ -874,8 +864,7 @@ GrassAndPsychicDeck: ; 305d6 (c:45d6)
 	db 2, GUST_OF_WIND
 	db 2, POTION
 	db 2, FULL_HEAL
-	db 0
-
+	db 0 ; end
 	tx GrassAndPsychicDeckName
 
 LegendaryMoltresDeck: ; 30609 (c:4609)
@@ -897,8 +886,7 @@ LegendaryMoltresDeck: ; 30609 (c:4609)
 	db 2, SWITCH
 	db 1, POTION
 	db 1, SUPER_POTION
-	db 0
-
+	db 0 ; end
 	tx LegendaryMoltresDeckName
 
 LegendaryZapdosDeck: ; 30630 (c:4630)
@@ -917,8 +905,7 @@ LegendaryZapdosDeck: ; 30630 (c:4630)
 	db 3, PLUSPOWER
 	db 3, POTION
 	db 1, GAMBLER
-	db 0
-
+	db 0 ; end
 	tx LegendaryZapdosDeckName
 
 LegendaryArticunoDeck: ; 30651 (c:4651)
@@ -936,8 +923,7 @@ LegendaryArticunoDeck: ; 30651 (c:4651)
 	db 3, SWITCH
 	db 4, SCOOP_UP
 	db 1, GAMBLER
-	db 0
-
+	db 0 ; end
 	tx LegendaryArticunoDeckName
 
 LegendaryDragoniteDeck: ; 30670 (c:4670)
@@ -960,8 +946,7 @@ LegendaryDragoniteDeck: ; 30670 (c:4670)
 	db 1, SUPER_ENERGY_RETRIEVAL
 	db 2, SWITCH
 	db 1, GAMBLER
-	db 0
-
+	db 0 ; end
 	tx LegendaryDragoniteDeckName
 
 FirstStrikeDeck: ; 30699 (c:4699)
@@ -979,8 +964,7 @@ FirstStrikeDeck: ; 30699 (c:4699)
 	db 2, SWITCH
 	db 3, GUST_OF_WIND
 	db 4, BILL
-	db 0
-
+	db 0 ; end
 	tx FirstStrikeDeckName
 
 RockCrusherDeck: ; 306b8 (c:46b8)
@@ -1001,8 +985,7 @@ RockCrusherDeck: ; 306b8 (c:46b8)
 	db 2, DEFENDER
 	db 1, SUPER_POTION
 	db 2, POTION
-	db 0
-
+	db 0 ; end
 	tx RockCrusherDeckName
 
 GoGoRainDanceDeck: ; 306dd (c:46dd)
@@ -1024,8 +1007,7 @@ GoGoRainDanceDeck: ; 306dd (c:46dd)
 	db 2, SWITCH
 	db 2, POTION
 	db 1, GAMBLER
-	db 0
-
+	db 0 ; end
 	tx GoGoRainDanceDeckName
 
 ZappingSelfdestructDeck: ; 30704 (c:4704)
@@ -1044,8 +1026,7 @@ ZappingSelfdestructDeck: ; 30704 (c:4704)
 	db 4, DEFENDER
 	db 1, GUST_OF_WIND
 	db 4, POTION
-	db 0
-
+	db 0 ; end
 	tx ZappingSelfdestructDeckName
 
 FlowerPowerDeck: ; 30725 (c:4725)
@@ -1065,8 +1046,7 @@ FlowerPowerDeck: ; 30725 (c:4725)
 	db 2, ENERGY_RETRIEVAL
 	db 2, SWITCH
 	db 2, POTION
-	db 0
-
+	db 0 ; end
 	tx FlowerPowerDeckName
 
 StrangePsyshockDeck: ; 30748 (c:4748)
@@ -1085,8 +1065,7 @@ StrangePsyshockDeck: ; 30748 (c:4748)
 	db 4, SCOOP_UP
 	db 4, SWITCH
 	db 1, GAMBLER
-	db 0
-
+	db 0 ; end
 	tx StrangePsyshockDeckName
 
 WondersofScienceDeck: ; 30769 (c:4769)
@@ -1109,8 +1088,7 @@ WondersofScienceDeck: ; 30769 (c:4769)
 	db 2, POKEDEX
 	db 2, MAINTENANCE
 	db 2, FULL_HEAL
-	db 0
-
+	db 0 ; end
 	tx WondersofScienceDeckName
 
 FireChargeDeck: ; 30792 (c:4792)
@@ -1134,8 +1112,7 @@ FireChargeDeck: ; 30792 (c:4792)
 	db 1, FULL_HEAL
 	db 3, RECYCLE
 	db 1, GAMBLER
-	db 0
-
+	db 0 ; end
 	tx FireChargeDeckName
 
 ImRonaldDeck: ; 307bd (c:47bd)
@@ -1160,8 +1137,7 @@ ImRonaldDeck: ; 307bd (c:47bd)
 	db 1, PLUSPOWER
 	db 1, DEFENDER
 	db 2, GUST_OF_WIND
-	db 0
-
+	db 0 ; end
 	tx ImRonaldDeckName
 
 PowerfulRonaldDeck: ; 307ea (c:47ea)
@@ -1189,8 +1165,7 @@ PowerfulRonaldDeck: ; 307ea (c:47ea)
 	db 2, GUST_OF_WIND
 	db 1, FULL_HEAL
 	db 1, GAMBLER
-	db 0
-
+	db 0 ; end
 	tx PowerfulRonaldDeckName
 
 InvincibleRonaldDeck: ; 3081d (c:481d)
@@ -1214,8 +1189,7 @@ InvincibleRonaldDeck: ; 3081d (c:481d)
 	db 2, GUST_OF_WIND
 	db 2, PLUSPOWER
 	db 1, GAMBLER
-	db 0
-
+	db 0 ; end
 	tx InvincibleRonaldDeckName
 
 LegendaryRonaldDeck: ; 30848 (c:4848)
@@ -1239,8 +1213,7 @@ LegendaryRonaldDeck: ; 30848 (c:4848)
 	db 3, ENERGY_REMOVAL
 	db 3, SCOOP_UP
 	db 1, GAMBLER
-	db 0
-
+	db 0 ; end
 	tx LegendaryRonaldDeckName
 
 MusclesforBrainsDeck: ; 30873 (c:4873)
@@ -1266,8 +1239,7 @@ MusclesforBrainsDeck: ; 30873 (c:4873)
 	db 1, SUPER_POTION
 	db 1, FULL_HEAL
 	db 1, REVIVE
-	db 0
-
+	db 0 ; end
 	tx MusclesforBrainsDeckName
 
 HeatedBattleDeck: ; 308a2 (c:48a2)
@@ -1287,8 +1259,7 @@ HeatedBattleDeck: ; 308a2 (c:48a2)
 	db 2, DEFENDER
 	db 3, POTION
 	db 2, FULL_HEAL
-	db 0
-
+	db 0 ; end
 	tx HeatedBattleDeckName
 
 LovetoBattleDeck: ; 308c5 (c:48c5)
@@ -1307,8 +1278,7 @@ LovetoBattleDeck: ; 308c5 (c:48c5)
 	db 4, DEFENDER
 	db 3, POTION
 	db 2, FULL_HEAL
-	db 0
-
+	db 0 ; end
 	tx LovetoBattleDeckName
 
 ExcavationDeck: ; 308e6 (c:48e6)
@@ -1330,8 +1300,7 @@ ExcavationDeck: ; 308e6 (c:48e6)
 	db 2, BILL
 	db 2, POKEMON_BREEDER
 	db 4, MYSTERIOUS_FOSSIL
-	db 0
-
+	db 0 ; end
 	tx ExcavationDeckName
 
 BlisteringPokemonDeck: ; 3090d (c:490d)
@@ -1355,8 +1324,7 @@ BlisteringPokemonDeck: ; 3090d (c:490d)
 	db 3, SWITCH
 	db 3, DEFENDER
 	db 2, GUST_OF_WIND
-	db 0
-
+	db 0 ; end
 	tx BlisteringPokemonDeckName
 
 HardPokemonDeck: ; 30938 (c:4938)
@@ -1375,8 +1343,7 @@ HardPokemonDeck: ; 30938 (c:4938)
 	db 4, DEFENDER
 	db 3, GUST_OF_WIND
 	db 2, POTION
-	db 0
-
+	db 0 ; end
 	tx HardPokemonDeckName
 
 WaterfrontPokemonDeck: ; 30959 (c:4959)
@@ -1406,8 +1373,7 @@ WaterfrontPokemonDeck: ; 30959 (c:4959)
 	db 1, GUST_OF_WIND
 	db 2, POTION
 	db 1, SUPER_POTION
-	db 0
-
+	db 0 ; end
 	tx WaterfrontPokemonDeckName
 
 LonelyFriendsDeck: ; 30990 (c:4990)
@@ -1429,8 +1395,7 @@ LonelyFriendsDeck: ; 30990 (c:4990)
 	db 2, SCOOP_UP
 	db 4, POTION
 	db 1, SUPER_POTION
-	db 0
-
+	db 0 ; end
 	tx LonelyFriendsDeckName
 
 SoundoftheWavesDeck: ; 309b7 (c:49b7)
@@ -1451,8 +1416,7 @@ SoundoftheWavesDeck: ; 309b7 (c:49b7)
 	db 2, ENERGY_REMOVAL
 	db 3, PLUSPOWER
 	db 2, FULL_HEAL
-	db 0
-
+	db 0 ; end
 	tx SoundoftheWavesDeckName
 
 PikachuDeck: ; 309dc (c:49dc)
@@ -1473,8 +1437,7 @@ PikachuDeck: ; 309dc (c:49dc)
 	db 4, POTION
 	db 2, SUPER_POTION
 	db 4, FULL_HEAL
-	db 0
-
+	db 0 ; end
 	tx PikachuDeckName
 
 BoomBoomSelfdestructDeck: ; 30a01 (c:4a01)
@@ -1492,8 +1455,7 @@ BoomBoomSelfdestructDeck: ; 30a01 (c:4a01)
 	db 2, PROFESSOR_OAK
 	db 2, ENERGY_SEARCH
 	db 2, DEFENDER
-	db 0
-
+	db 0 ; end
 	tx BoomBoomSelfdestructDeckName
 
 PowerGeneratorDeck: ; 30a20 (c:4a20)
@@ -1517,8 +1479,7 @@ PowerGeneratorDeck: ; 30a20 (c:4a20)
 	db 2, POKEMON_TRADER
 	db 2, SWITCH
 	db 4, DEFENDER
-	db 0
-
+	db 0 ; end
 	tx PowerGeneratorDeckName
 
 EtceteraDeck: ; 30a4b (c:4a4b)
@@ -1546,8 +1507,7 @@ EtceteraDeck: ; 30a4b (c:4a4b)
 	db 3, POKE_BALL
 	db 3, PLUSPOWER
 	db 2, DEFENDER
-	db 0
-
+	db 0 ; end
 	tx EtceteraDeckName
 
 FlowerGardenDeck: ; 30a7e (c:4a7e)
@@ -1571,8 +1531,7 @@ FlowerGardenDeck: ; 30a7e (c:4a7e)
 	db 2, SWITCH
 	db 2, POTION
 	db 1, FULL_HEAL
-	db 0
-
+	db 0 ; end
 	tx FlowerGardenDeckName
 
 KaleidoscopeDeck: ; 30aa9 (c:4aa9)
@@ -1597,8 +1556,7 @@ KaleidoscopeDeck: ; 30aa9 (c:4aa9)
 	db 2, ENERGY_SEARCH
 	db 4, SWITCH
 	db 2, GUST_OF_WIND
-	db 0
-
+	db 0 ; end
 	tx KaleidoscopeDeckName
 
 GhostDeck: ; 30ad6 (c:4ad6)
@@ -1621,8 +1579,7 @@ GhostDeck: ; 30ad6 (c:4ad6)
 	db 2, POTION
 	db 1, FULL_HEAL
 	db 2, RECYCLE
-	db 0
-
+	db 0 ; end
 	tx GhostDeckName
 
 NapTimeDeck: ; 30aff (c:4aff)
@@ -1640,8 +1597,7 @@ NapTimeDeck: ; 30aff (c:4aff)
 	db 3, PLUSPOWER
 	db 2, GUST_OF_WIND
 	db 2, POTION
-	db 0
-
+	db 0 ; end
 	tx NapTimeDeckName
 
 StrangePowerDeck: ; 30b1e (c:4b1e)
@@ -1665,8 +1621,7 @@ StrangePowerDeck: ; 30b1e (c:4b1e)
 	db 1, ITEM_FINDER
 	db 1, GUST_OF_WIND
 	db 1, FULL_HEAL
-	db 0
-
+	db 0 ; end
 	tx StrangePowerDeckName
 
 FlyinPokemonDeck: ; 30b49 (c:4b49)
@@ -1686,8 +1641,7 @@ FlyinPokemonDeck: ; 30b49 (c:4b49)
 	db 2, LASS
 	db 2, BILL
 	db 4, POTION
-	db 0
-
+	db 0 ; end
 	tx FlyinPokemonDeckName
 
 LovelyNidoranDeck: ; 30b6c (c:4b6c)
@@ -1712,8 +1666,7 @@ LovelyNidoranDeck: ; 30b6c (c:4b6c)
 	db 1, SWITCH
 	db 2, POKE_BALL
 	db 1, GAMBLER
-	db 0
-
+	db 0 ; end
 	tx LovelyNidoranDeckName
 
 PoisonDeck: ; 30b99 (c:4b99)
@@ -1734,8 +1687,7 @@ PoisonDeck: ; 30b99 (c:4b99)
 	db 2, POTION
 	db 2, FULL_HEAL
 	db 1, GAMBLER
-	db 0
-
+	db 0 ; end
 	tx PoisonDeckName
 
 AngerDeck: ; 30bbe (c:4bbe)
@@ -1757,8 +1709,7 @@ AngerDeck: ; 30bbe (c:4bbe)
 	db 4, PLUSPOWER
 	db 2, DEFENDER
 	db 2, GUST_OF_WIND
-	db 0
-
+	db 0 ; end
 	tx AngerDeckName
 
 FlamethrowerDeck: ; 30be5 (c:4be5)
@@ -1781,8 +1732,7 @@ FlamethrowerDeck: ; 30be5 (c:4be5)
 	db 2, SWITCH
 	db 2, PLUSPOWER
 	db 3, GUST_OF_WIND
-	db 0
-
+	db 0 ; end
 	tx FlamethrowerDeckName
 
 ReshuffleDeck: ; 30c0e (c:4c0e)
@@ -1808,8 +1758,7 @@ ReshuffleDeck: ; 30c0e (c:4c0e)
 	db 2, SWITCH
 	db 1, POKEMON_CENTER
 	db 2, POTION
-	db 0
-
+	db 0 ; end
 	tx ReshuffleDeckName
 
 ImakuniDeck: ; 30c3d (c:4c3d)
@@ -1827,6 +1776,5 @@ ImakuniDeck: ; 30c3d (c:4c3d)
 	db 2, MAINTENANCE
 	db 2, POKEMON_FLUTE
 	db 1, GAMBLER
-	db 0
-
+	db 0 ; end
 	tx ImakuniDeckName
-- 
cgit v1.2.3


From bfeeb34666e8a9d91317f285e078c73d498351f7 Mon Sep 17 00:00:00 2001
From: xCrystal <rgr.crystal@gmail.com>
Date: Wed, 7 Feb 2018 21:13:52 +0100
Subject: More accurate card type constants

---
 src/data/cards.asm | 456 ++++++++++++++++++++++++++---------------------------
 1 file changed, 228 insertions(+), 228 deletions(-)

(limited to 'src/data')

diff --git a/src/data/cards.asm b/src/data/cards.asm
index d8dc226..4b1a54b 100755
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@@ -234,7 +234,7 @@ CardPointers: ; 30c5c (c:4c5c)
 	dw $0000
 
 BulbasaurCard: ; 30e28 (c:4e28)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx BulbasaurCardGfx ; gfx
 	tx BulbasaurName ; name
 	db CIRCLE ; rarity
@@ -285,7 +285,7 @@ BulbasaurCard: ; 30e28 (c:4e28)
 	db 16
 
 IvysaurCard: ; 30e69 (c:4e69)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx IvysaurCardGfx ; gfx
 	tx IvysaurName ; name
 	db DIAMOND ; rarity
@@ -336,7 +336,7 @@ IvysaurCard: ; 30e69 (c:4e69)
 	db 16
 
 Venusaur1Card: ; 30eaa (c:4eaa)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx Venusaur1CardGfx ; gfx
 	tx VenusaurName ; name
 	db STAR ; rarity
@@ -387,7 +387,7 @@ Venusaur1Card: ; 30eaa (c:4eaa)
 	db 0
 
 Venusaur2Card: ; 30eeb (c:4eeb)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx Venusaur2CardGfx ; gfx
 	tx VenusaurName ; name
 	db STAR ; rarity
@@ -438,7 +438,7 @@ Venusaur2Card: ; 30eeb (c:4eeb)
 	db 0
 
 CaterpieCard: ; 30f2c (c:4f2c)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx CaterpieCardGfx ; gfx
 	tx CaterpieName ; name
 	db CIRCLE ; rarity
@@ -489,7 +489,7 @@ CaterpieCard: ; 30f2c (c:4f2c)
 	db 19
 
 MetapodCard: ; 30f6d (c:4f6d)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx MetapodCardGfx ; gfx
 	tx MetapodName ; name
 	db CIRCLE ; rarity
@@ -540,7 +540,7 @@ MetapodCard: ; 30f6d (c:4f6d)
 	db 16
 
 ButterfreeCard: ; 30fae (c:4fae)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx ButterfreeCardGfx ; gfx
 	tx ButterfreeName ; name
 	db DIAMOND ; rarity
@@ -591,7 +591,7 @@ ButterfreeCard: ; 30fae (c:4fae)
 	db 0
 
 WeedleCard: ; 30fef (c:4fef)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx WeedleCardGfx ; gfx
 	tx WeedleName ; name
 	db CIRCLE ; rarity
@@ -642,7 +642,7 @@ WeedleCard: ; 30fef (c:4fef)
 	db 19
 
 KakunaCard: ; 31030 (c:5030)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx KakunaCardGfx ; gfx
 	tx KakunaName ; name
 	db DIAMOND ; rarity
@@ -693,7 +693,7 @@ KakunaCard: ; 31030 (c:5030)
 	db 16
 
 BeedrillCard: ; 31071 (c:5071)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx BeedrillCardGfx ; gfx
 	tx BeedrillName ; name
 	db STAR ; rarity
@@ -744,7 +744,7 @@ BeedrillCard: ; 31071 (c:5071)
 	db 0
 
 EkansCard: ; 310b2 (c:50b2)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx EkansCardGfx ; gfx
 	tx EkansName ; name
 	db CIRCLE ; rarity
@@ -795,7 +795,7 @@ EkansCard: ; 310b2 (c:50b2)
 	db 19
 
 ArbokCard: ; 310f3 (c:50f3)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx ArbokCardGfx ; gfx
 	tx ArbokName ; name
 	db DIAMOND ; rarity
@@ -846,7 +846,7 @@ ArbokCard: ; 310f3 (c:50f3)
 	db 0
 
 NidoranFCard: ; 31134 (c:5134)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx NidoranFCardGfx ; gfx
 	tx NidoranFName ; name
 	db CIRCLE ; rarity
@@ -897,7 +897,7 @@ NidoranFCard: ; 31134 (c:5134)
 	db 19
 
 NidorinaCard: ; 31175 (c:5175)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx NidorinaCardGfx ; gfx
 	tx NidorinaName ; name
 	db DIAMOND ; rarity
@@ -948,7 +948,7 @@ NidorinaCard: ; 31175 (c:5175)
 	db 16
 
 NidoqueenCard: ; 311b6 (c:51b6)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx NidoqueenCardGfx ; gfx
 	tx NidoqueenName ; name
 	db STAR ; rarity
@@ -999,7 +999,7 @@ NidoqueenCard: ; 311b6 (c:51b6)
 	db 0
 
 NidoranMCard: ; 311f7 (c:51f7)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx NidoranMCardGfx ; gfx
 	tx NidoranMName ; name
 	db CIRCLE ; rarity
@@ -1050,7 +1050,7 @@ NidoranMCard: ; 311f7 (c:51f7)
 	db 19
 
 NidorinoCard: ; 31238 (c:5238)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx NidorinoCardGfx ; gfx
 	tx NidorinoName ; name
 	db DIAMOND ; rarity
@@ -1101,7 +1101,7 @@ NidorinoCard: ; 31238 (c:5238)
 	db 16
 
 NidokingCard: ; 31279 (c:5279)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx NidokingCardGfx ; gfx
 	tx NidokingName ; name
 	db STAR ; rarity
@@ -1152,7 +1152,7 @@ NidokingCard: ; 31279 (c:5279)
 	db 0
 
 ZubatCard: ; 312ba (c:52ba)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx ZubatCardGfx ; gfx
 	tx ZubatName ; name
 	db CIRCLE ; rarity
@@ -1203,7 +1203,7 @@ ZubatCard: ; 312ba (c:52ba)
 	db 16
 
 GolbatCard: ; 312fb (c:52fb)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx GolbatCardGfx ; gfx
 	tx GolbatName ; name
 	db DIAMOND ; rarity
@@ -1254,7 +1254,7 @@ GolbatCard: ; 312fb (c:52fb)
 	db 0
 
 OddishCard: ; 3133c (c:533c)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx OddishCardGfx ; gfx
 	tx OddishName ; name
 	db CIRCLE ; rarity
@@ -1305,7 +1305,7 @@ OddishCard: ; 3133c (c:533c)
 	db 16
 
 GloomCard: ; 3137d (c:537d)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx GloomCardGfx ; gfx
 	tx GloomName ; name
 	db DIAMOND ; rarity
@@ -1356,7 +1356,7 @@ GloomCard: ; 3137d (c:537d)
 	db 16
 
 VileplumeCard: ; 313be (c:53be)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx VileplumeCardGfx ; gfx
 	tx VileplumeName ; name
 	db STAR ; rarity
@@ -1407,7 +1407,7 @@ VileplumeCard: ; 313be (c:53be)
 	db 0
 
 ParasCard: ; 313ff (c:53ff)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx ParasCardGfx ; gfx
 	tx ParasName ; name
 	db CIRCLE ; rarity
@@ -1458,7 +1458,7 @@ ParasCard: ; 313ff (c:53ff)
 	db 16
 
 ParasectCard: ; 31440 (c:5440)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx ParasectCardGfx ; gfx
 	tx ParasectName ; name
 	db DIAMOND ; rarity
@@ -1509,7 +1509,7 @@ ParasectCard: ; 31440 (c:5440)
 	db 0
 
 VenonatCard: ; 31481 (c:5481)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx VenonatCardGfx ; gfx
 	tx VenonatName ; name
 	db CIRCLE ; rarity
@@ -1560,7 +1560,7 @@ VenonatCard: ; 31481 (c:5481)
 	db 19
 
 VenomothCard: ; 314c2 (c:54c2)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx VenomothCardGfx ; gfx
 	tx VenomothName ; name
 	db STAR ; rarity
@@ -1611,7 +1611,7 @@ VenomothCard: ; 314c2 (c:54c2)
 	db 0
 
 BellsproutCard: ; 31503 (c:5503)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx BellsproutCardGfx ; gfx
 	tx BellsproutName ; name
 	db CIRCLE ; rarity
@@ -1662,7 +1662,7 @@ BellsproutCard: ; 31503 (c:5503)
 	db 19
 
 WeepinbellCard: ; 31544 (c:5544)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx WeepinbellCardGfx ; gfx
 	tx WeepinbellName ; name
 	db DIAMOND ; rarity
@@ -1713,7 +1713,7 @@ WeepinbellCard: ; 31544 (c:5544)
 	db 16
 
 VictreebelCard: ; 31585 (c:5585)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx VictreebelCardGfx ; gfx
 	tx VictreebelName ; name
 	db STAR ; rarity
@@ -1764,7 +1764,7 @@ VictreebelCard: ; 31585 (c:5585)
 	db 0
 
 GrimerCard: ; 315c6 (c:55c6)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx GrimerCardGfx ; gfx
 	tx GrimerName ; name
 	db CIRCLE ; rarity
@@ -1815,7 +1815,7 @@ GrimerCard: ; 315c6 (c:55c6)
 	db 19
 
 MukCard: ; 31607 (c:5607)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx MukCardGfx ; gfx
 	tx MukName ; name
 	db STAR ; rarity
@@ -1866,7 +1866,7 @@ MukCard: ; 31607 (c:5607)
 	db 0
 
 ExeggcuteCard: ; 31648 (c:5648)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx ExeggcuteCardGfx ; gfx
 	tx ExeggcuteName ; name
 	db CIRCLE ; rarity
@@ -1917,7 +1917,7 @@ ExeggcuteCard: ; 31648 (c:5648)
 	db 18
 
 ExeggutorCard: ; 31689 (c:5689)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx ExeggutorCardGfx ; gfx
 	tx ExeggutorName ; name
 	db DIAMOND ; rarity
@@ -1968,7 +1968,7 @@ ExeggutorCard: ; 31689 (c:5689)
 	db 0
 
 KoffingCard: ; 316ca (c:56ca)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx KoffingCardGfx ; gfx
 	tx KoffingName ; name
 	db CIRCLE ; rarity
@@ -2019,7 +2019,7 @@ KoffingCard: ; 316ca (c:56ca)
 	db 16
 
 WeezingCard: ; 3170b (c:570b)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx WeezingCardGfx ; gfx
 	tx WeezingName ; name
 	db DIAMOND ; rarity
@@ -2070,7 +2070,7 @@ WeezingCard: ; 3170b (c:570b)
 	db 0
 
 Tangela1Card: ; 3174c (c:574c)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx Tangela1CardGfx ; gfx
 	tx TangelaName ; name
 	db CIRCLE ; rarity
@@ -2121,7 +2121,7 @@ Tangela1Card: ; 3174c (c:574c)
 	db 0
 
 Tangela2Card: ; 3178d (c:578d)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx Tangela2CardGfx ; gfx
 	tx TangelaName ; name
 	db CIRCLE ; rarity
@@ -2172,7 +2172,7 @@ Tangela2Card: ; 3178d (c:578d)
 	db 0
 
 ScytherCard: ; 317ce (c:57ce)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx ScytherCardGfx ; gfx
 	tx ScytherName ; name
 	db STAR ; rarity
@@ -2223,7 +2223,7 @@ ScytherCard: ; 317ce (c:57ce)
 	db 0
 
 PinsirCard: ; 3180f (c:580f)
-	db GRASS ; type
+	db TYPE_PKMN_GRASS ; type
 	gfx PinsirCardGfx ; gfx
 	tx PinsirName ; name
 	db STAR ; rarity
@@ -2274,7 +2274,7 @@ PinsirCard: ; 3180f (c:580f)
 	db 0
 
 CharmanderCard: ; 31850 (c:5850)
-	db FIRE ; type
+	db TYPE_PKMN_FIRE ; type
 	gfx CharmanderCardGfx ; gfx
 	tx CharmanderName ; name
 	db CIRCLE ; rarity
@@ -2325,7 +2325,7 @@ CharmanderCard: ; 31850 (c:5850)
 	db 21
 
 CharmeleonCard: ; 31891 (c:5891)
-	db FIRE ; type
+	db TYPE_PKMN_FIRE ; type
 	gfx CharmeleonCardGfx ; gfx
 	tx CharmeleonName ; name
 	db DIAMOND ; rarity
@@ -2376,7 +2376,7 @@ CharmeleonCard: ; 31891 (c:5891)
 	db 18
 
 CharizardCard: ; 318d2 (c:58d2)
-	db FIRE ; type
+	db TYPE_PKMN_FIRE ; type
 	gfx CharizardCardGfx ; gfx
 	tx CharizardName ; name
 	db STAR ; rarity
@@ -2427,7 +2427,7 @@ CharizardCard: ; 318d2 (c:58d2)
 	db 0
 
 VulpixCard: ; 31913 (c:5913)
-	db FIRE ; type
+	db TYPE_PKMN_FIRE ; type
 	gfx VulpixCardGfx ; gfx
 	tx VulpixName ; name
 	db CIRCLE ; rarity
@@ -2478,7 +2478,7 @@ VulpixCard: ; 31913 (c:5913)
 	db 18
 
 Ninetails1Card: ; 31954 (c:5954)
-	db FIRE ; type
+	db TYPE_PKMN_FIRE ; type
 	gfx Ninetails1CardGfx ; gfx
 	tx NinetailsName ; name
 	db STAR ; rarity
@@ -2529,7 +2529,7 @@ Ninetails1Card: ; 31954 (c:5954)
 	db 0
 
 Ninetails2Card: ; 31995 (c:5995)
-	db FIRE ; type
+	db TYPE_PKMN_FIRE ; type
 	gfx Ninetails2CardGfx ; gfx
 	tx NinetailsName ; name
 	db STAR ; rarity
@@ -2580,7 +2580,7 @@ Ninetails2Card: ; 31995 (c:5995)
 	db 0
 
 GrowlitheCard: ; 319d6 (c:59d6)
-	db FIRE ; type
+	db TYPE_PKMN_FIRE ; type
 	gfx GrowlitheCardGfx ; gfx
 	tx GrowlitheName ; name
 	db DIAMOND ; rarity
@@ -2631,7 +2631,7 @@ GrowlitheCard: ; 319d6 (c:59d6)
 	db 16
 
 Arcanine1Card: ; 31a17 (c:5a17)
-	db FIRE ; type
+	db TYPE_PKMN_FIRE ; type
 	gfx Arcanine1CardGfx ; gfx
 	tx ArcanineName ; name
 	db PROMOSTAR ; rarity
@@ -2682,7 +2682,7 @@ Arcanine1Card: ; 31a17 (c:5a17)
 	db 0
 
 Arcanine2Card: ; 31a58 (c:5a58)
-	db FIRE ; type
+	db TYPE_PKMN_FIRE ; type
 	gfx Arcanine2CardGfx ; gfx
 	tx ArcanineName ; name
 	db DIAMOND ; rarity
@@ -2733,7 +2733,7 @@ Arcanine2Card: ; 31a58 (c:5a58)
 	db 0
 
 PonytaCard: ; 31a99 (c:5a99)
-	db FIRE ; type
+	db TYPE_PKMN_FIRE ; type
 	gfx PonytaCardGfx ; gfx
 	tx PonytaName ; name
 	db CIRCLE ; rarity
@@ -2784,7 +2784,7 @@ PonytaCard: ; 31a99 (c:5a99)
 	db 16
 
 RapidashCard: ; 31ada (c:5ada)
-	db FIRE ; type
+	db TYPE_PKMN_FIRE ; type
 	gfx RapidashCardGfx ; gfx
 	tx RapidashName ; name
 	db DIAMOND ; rarity
@@ -2835,7 +2835,7 @@ RapidashCard: ; 31ada (c:5ada)
 	db 0
 
 Magmar1Card: ; 31b1b (c:5b1b)
-	db FIRE ; type
+	db TYPE_PKMN_FIRE ; type
 	gfx Magmar1CardGfx ; gfx
 	tx MagmarName ; name
 	db DIAMOND ; rarity
@@ -2886,7 +2886,7 @@ Magmar1Card: ; 31b1b (c:5b1b)
 	db 0
 
 Magmar2Card: ; 31b5c (c:5b5c)
-	db FIRE ; type
+	db TYPE_PKMN_FIRE ; type
 	gfx Magmar2CardGfx ; gfx
 	tx MagmarName ; name
 	db DIAMOND ; rarity
@@ -2937,7 +2937,7 @@ Magmar2Card: ; 31b5c (c:5b5c)
 	db 3
 
 Flareon1Card: ; 31b9d (c:5b9d)
-	db FIRE ; type
+	db TYPE_PKMN_FIRE ; type
 	gfx Flareon1CardGfx ; gfx
 	tx FlareonName ; name
 	db DIAMOND ; rarity
@@ -2988,7 +2988,7 @@ Flareon1Card: ; 31b9d (c:5b9d)
 	db 0
 
 Flareon2Card: ; 31bde (c:5bde)
-	db FIRE ; type
+	db TYPE_PKMN_FIRE ; type
 	gfx Flareon2CardGfx ; gfx
 	tx FlareonName ; name
 	db STAR ; rarity
@@ -3039,7 +3039,7 @@ Flareon2Card: ; 31bde (c:5bde)
 	db 0
 
 Moltres1Card: ; 31c1f (c:5c1f)
-	db FIRE ; type
+	db TYPE_PKMN_FIRE ; type
 	gfx Moltres1CardGfx ; gfx
 	tx MoltresName ; name
 	db STAR ; rarity
@@ -3090,7 +3090,7 @@ Moltres1Card: ; 31c1f (c:5c1f)
 	db 0
 
 Moltres2Card: ; 31c60 (c:5c60)
-	db FIRE ; type
+	db TYPE_PKMN_FIRE ; type
 	gfx Moltres2CardGfx ; gfx
 	tx MoltresName ; name
 	db STAR ; rarity
@@ -3141,7 +3141,7 @@ Moltres2Card: ; 31c60 (c:5c60)
 	db 0
 
 SquirtleCard: ; 31ca1 (c:5ca1)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx SquirtleCardGfx ; gfx
 	tx SquirtleName ; name
 	db CIRCLE ; rarity
@@ -3192,7 +3192,7 @@ SquirtleCard: ; 31ca1 (c:5ca1)
 	db 21
 
 WartortleCard: ; 31ce2 (c:5ce2)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx WartortleCardGfx ; gfx
 	tx WartortleName ; name
 	db DIAMOND ; rarity
@@ -3243,7 +3243,7 @@ WartortleCard: ; 31ce2 (c:5ce2)
 	db 18
 
 BlastoiseCard: ; 31d23 (c:5d23)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx BlastoiseCardGfx ; gfx
 	tx BlastoiseName ; name
 	db STAR ; rarity
@@ -3294,7 +3294,7 @@ BlastoiseCard: ; 31d23 (c:5d23)
 	db 0
 
 PsyduckCard: ; 31d64 (c:5d64)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx PsyduckCardGfx ; gfx
 	tx PsyduckName ; name
 	db CIRCLE ; rarity
@@ -3345,7 +3345,7 @@ PsyduckCard: ; 31d64 (c:5d64)
 	db 19
 
 GolduckCard: ; 31da5 (c:5da5)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx GolduckCardGfx ; gfx
 	tx GolduckName ; name
 	db DIAMOND ; rarity
@@ -3396,7 +3396,7 @@ GolduckCard: ; 31da5 (c:5da5)
 	db 3
 
 PoliwagCard: ; 31de6 (c:5de6)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx PoliwagCardGfx ; gfx
 	tx PoliwagName ; name
 	db CIRCLE ; rarity
@@ -3447,7 +3447,7 @@ PoliwagCard: ; 31de6 (c:5de6)
 	db 19
 
 PoliwhirlCard: ; 31e27 (c:5e27)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx PoliwhirlCardGfx ; gfx
 	tx PoliwhirlName ; name
 	db DIAMOND ; rarity
@@ -3498,7 +3498,7 @@ PoliwhirlCard: ; 31e27 (c:5e27)
 	db 16
 
 PoliwrathCard: ; 31e68 (c:5e68)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx PoliwrathCardGfx ; gfx
 	tx PoliwrathName ; name
 	db STAR ; rarity
@@ -3549,7 +3549,7 @@ PoliwrathCard: ; 31e68 (c:5e68)
 	db 0
 
 TentacoolCard: ; 31ea9 (c:5ea9)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx TentacoolCardGfx ; gfx
 	tx TentacoolName ; name
 	db CIRCLE ; rarity
@@ -3600,7 +3600,7 @@ TentacoolCard: ; 31ea9 (c:5ea9)
 	db 19
 
 TentacruelCard: ; 31eea (c:5eea)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx TentacruelCardGfx ; gfx
 	tx TentacruelName ; name
 	db DIAMOND ; rarity
@@ -3651,7 +3651,7 @@ TentacruelCard: ; 31eea (c:5eea)
 	db 0
 
 SeelCard: ; 31f2b (c:5f2b)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx SeelCardGfx ; gfx
 	tx SeelName ; name
 	db DIAMOND ; rarity
@@ -3702,7 +3702,7 @@ SeelCard: ; 31f2b (c:5f2b)
 	db 19
 
 DewgongCard: ; 31f6c (c:5f6c)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx DewgongCardGfx ; gfx
 	tx DewgongName ; name
 	db DIAMOND ; rarity
@@ -3753,7 +3753,7 @@ DewgongCard: ; 31f6c (c:5f6c)
 	db 0
 
 ShellderCard: ; 31fad (c:5fad)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx ShellderCardGfx ; gfx
 	tx ShellderName ; name
 	db CIRCLE ; rarity
@@ -3804,7 +3804,7 @@ ShellderCard: ; 31fad (c:5fad)
 	db 19
 
 CloysterCard: ; 31fee (c:5fee)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx CloysterCardGfx ; gfx
 	tx CloysterName ; name
 	db DIAMOND ; rarity
@@ -3855,7 +3855,7 @@ CloysterCard: ; 31fee (c:5fee)
 	db 0
 
 KrabbyCard: ; 3202f (c:602f)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx KrabbyCardGfx ; gfx
 	tx KrabbyName ; name
 	db CIRCLE ; rarity
@@ -3906,7 +3906,7 @@ KrabbyCard: ; 3202f (c:602f)
 	db 16
 
 KinglerCard: ; 32070 (c:6070)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx KinglerCardGfx ; gfx
 	tx KinglerName ; name
 	db DIAMOND ; rarity
@@ -3957,7 +3957,7 @@ KinglerCard: ; 32070 (c:6070)
 	db 0
 
 HorseaCard: ; 320b1 (c:60b1)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx HorseaCardGfx ; gfx
 	tx HorseaName ; name
 	db CIRCLE ; rarity
@@ -4008,7 +4008,7 @@ HorseaCard: ; 320b1 (c:60b1)
 	db 19
 
 SeadraCard: ; 320f2 (c:60f2)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx SeadraCardGfx ; gfx
 	tx SeadraName ; name
 	db DIAMOND ; rarity
@@ -4059,7 +4059,7 @@ SeadraCard: ; 320f2 (c:60f2)
 	db 0
 
 GoldeenCard: ; 32133 (c:6133)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx GoldeenCardGfx ; gfx
 	tx GoldeenName ; name
 	db CIRCLE ; rarity
@@ -4110,7 +4110,7 @@ GoldeenCard: ; 32133 (c:6133)
 	db 21
 
 SeakingCard: ; 32174 (c:6174)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx SeakingCardGfx ; gfx
 	tx SeakingName ; name
 	db DIAMOND ; rarity
@@ -4161,7 +4161,7 @@ SeakingCard: ; 32174 (c:6174)
 	db 0
 
 StaryuCard: ; 321b5 (c:61b5)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx StaryuCardGfx ; gfx
 	tx StaryuName ; name
 	db CIRCLE ; rarity
@@ -4212,7 +4212,7 @@ StaryuCard: ; 321b5 (c:61b5)
 	db 19
 
 StarmieCard: ; 321f6 (c:61f6)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx StarmieCardGfx ; gfx
 	tx StarmieName ; name
 	db CIRCLE ; rarity
@@ -4263,7 +4263,7 @@ StarmieCard: ; 321f6 (c:61f6)
 	db 0
 
 MagikarpCard: ; 32237 (c:6237)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx MagikarpCardGfx ; gfx
 	tx MagikarpName ; name
 	db DIAMOND ; rarity
@@ -4314,7 +4314,7 @@ MagikarpCard: ; 32237 (c:6237)
 	db 18
 
 GyaradosCard: ; 32278 (c:6278)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx GyaradosCardGfx ; gfx
 	tx GyaradosName ; name
 	db STAR ; rarity
@@ -4365,7 +4365,7 @@ GyaradosCard: ; 32278 (c:6278)
 	db 0
 
 LaprasCard: ; 322b9 (c:62b9)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx LaprasCardGfx ; gfx
 	tx LaprasName ; name
 	db STAR ; rarity
@@ -4416,7 +4416,7 @@ LaprasCard: ; 322b9 (c:62b9)
 	db 0
 
 Vaporeon1Card: ; 322fa (c:62fa)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx Vaporeon1CardGfx ; gfx
 	tx VaporeonName ; name
 	db DIAMOND ; rarity
@@ -4467,7 +4467,7 @@ Vaporeon1Card: ; 322fa (c:62fa)
 	db 0
 
 Vaporeon2Card: ; 3233b (c:633b)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx Vaporeon2CardGfx ; gfx
 	tx VaporeonName ; name
 	db STAR ; rarity
@@ -4518,7 +4518,7 @@ Vaporeon2Card: ; 3233b (c:633b)
 	db 0
 
 OmanyteCard: ; 3237c (c:637c)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx OmanyteCardGfx ; gfx
 	tx OmanyteName ; name
 	db CIRCLE ; rarity
@@ -4569,7 +4569,7 @@ OmanyteCard: ; 3237c (c:637c)
 	db 17
 
 OmastarCard: ; 323bd (c:63bd)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx OmastarCardGfx ; gfx
 	tx OmastarName ; name
 	db DIAMOND ; rarity
@@ -4620,7 +4620,7 @@ OmastarCard: ; 323bd (c:63bd)
 	db 0
 
 Articuno1Card: ; 323fe (c:63fe)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx Articuno1CardGfx ; gfx
 	tx ArticunoName ; name
 	db STAR ; rarity
@@ -4671,7 +4671,7 @@ Articuno1Card: ; 323fe (c:63fe)
 	db 0
 
 Articuno2Card: ; 3243f (c:643f)
-	db WATER ; type
+	db TYPE_PKMN_WATER ; type
 	gfx Articuno2CardGfx ; gfx
 	tx ArticunoName ; name
 	db STAR ; rarity
@@ -4722,7 +4722,7 @@ Articuno2Card: ; 3243f (c:643f)
 	db 0
 
 Pikachu1Card: ; 32480 (c:6480)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Pikachu1CardGfx ; gfx
 	tx PikachuName ; name
 	db CIRCLE ; rarity
@@ -4773,7 +4773,7 @@ Pikachu1Card: ; 32480 (c:6480)
 	db 19
 
 Pikachu2Card: ; 324c1 (c:64c1)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Pikachu2CardGfx ; gfx
 	tx PikachuName ; name
 	db CIRCLE ; rarity
@@ -4824,7 +4824,7 @@ Pikachu2Card: ; 324c1 (c:64c1)
 	db 16
 
 Pikachu3Card: ; 32502 (c:6502)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Pikachu3CardGfx ; gfx
 	tx PikachuName ; name
 	db PROMOSTAR ; rarity
@@ -4875,7 +4875,7 @@ Pikachu3Card: ; 32502 (c:6502)
 	db 16
 
 Pikachu4Card: ; 32543 (c:6543)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Pikachu4CardGfx ; gfx
 	tx PikachuName ; name
 	db PROMOSTAR ; rarity
@@ -4926,7 +4926,7 @@ Pikachu4Card: ; 32543 (c:6543)
 	db 16
 
 FlyingPikachuCard: ; 32584 (c:6584)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx FlyingPikachuCardGfx ; gfx
 	tx FlyingPikachuName ; name
 	db PROMOSTAR ; rarity
@@ -4977,7 +4977,7 @@ FlyingPikachuCard: ; 32584 (c:6584)
 	db 3
 
 SurfingPikachu1Card: ; 325c5 (c:65c5)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx SurfingPikachu1CardGfx ; gfx
 	tx SurfingPikachuName ; name
 	db PROMOSTAR ; rarity
@@ -5028,7 +5028,7 @@ SurfingPikachu1Card: ; 325c5 (c:65c5)
 	db 0
 
 SurfingPikachu2Card: ; 32606 (c:6606)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx SurfingPikachu2CardGfx ; gfx
 	tx SurfingPikachuName ; name
 	db PROMOSTAR ; rarity
@@ -5079,7 +5079,7 @@ SurfingPikachu2Card: ; 32606 (c:6606)
 	db 0
 
 Raichu1Card: ; 32647 (c:6647)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Raichu1CardGfx ; gfx
 	tx RaichuName ; name
 	db STAR ; rarity
@@ -5130,7 +5130,7 @@ Raichu1Card: ; 32647 (c:6647)
 	db 0
 
 Raichu2Card: ; 32688 (c:6688)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Raichu2CardGfx ; gfx
 	tx RaichuName ; name
 	db STAR ; rarity
@@ -5181,7 +5181,7 @@ Raichu2Card: ; 32688 (c:6688)
 	db 0
 
 Magnemite1Card: ; 326c9 (c:66c9)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Magnemite1CardGfx ; gfx
 	tx MagnemiteName ; name
 	db CIRCLE ; rarity
@@ -5232,7 +5232,7 @@ Magnemite1Card: ; 326c9 (c:66c9)
 	db 19
 
 Magnemite2Card: ; 3270a (c:670a)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Magnemite2CardGfx ; gfx
 	tx MagnemiteName ; name
 	db CIRCLE ; rarity
@@ -5283,7 +5283,7 @@ Magnemite2Card: ; 3270a (c:670a)
 	db 19
 
 Magneton1Card: ; 3274b (c:674b)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Magneton1CardGfx ; gfx
 	tx MagnetonName ; name
 	db STAR ; rarity
@@ -5334,7 +5334,7 @@ Magneton1Card: ; 3274b (c:674b)
 	db 0
 
 Magneton2Card: ; 3278c (c:678c)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Magneton2CardGfx ; gfx
 	tx MagnetonName ; name
 	db STAR ; rarity
@@ -5385,7 +5385,7 @@ Magneton2Card: ; 3278c (c:678c)
 	db 0
 
 VoltorbCard: ; 327cd (c:67cd)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx VoltorbCardGfx ; gfx
 	tx VoltorbName ; name
 	db CIRCLE ; rarity
@@ -5436,7 +5436,7 @@ VoltorbCard: ; 327cd (c:67cd)
 	db 21
 
 Electrode1Card: ; 3280e (c:680e)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Electrode1CardGfx ; gfx
 	tx ElectrodeName ; name
 	db STAR ; rarity
@@ -5487,7 +5487,7 @@ Electrode1Card: ; 3280e (c:680e)
 	db 0
 
 Electrode2Card: ; 3284f (c:684f)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Electrode2CardGfx ; gfx
 	tx ElectrodeName ; name
 	db STAR ; rarity
@@ -5538,7 +5538,7 @@ Electrode2Card: ; 3284f (c:684f)
 	db 0
 
 Electabuzz1Card: ; 32890 (c:6890)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Electabuzz1CardGfx ; gfx
 	tx ElectabuzzName ; name
 	db PROMOSTAR ; rarity
@@ -5589,7 +5589,7 @@ Electabuzz1Card: ; 32890 (c:6890)
 	db 0
 
 Electabuzz2Card: ; 328d1 (c:68d1)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Electabuzz2CardGfx ; gfx
 	tx ElectabuzzName ; name
 	db STAR ; rarity
@@ -5640,7 +5640,7 @@ Electabuzz2Card: ; 328d1 (c:68d1)
 	db 0
 
 Jolteon1Card: ; 32912 (c:6912)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Jolteon1CardGfx ; gfx
 	tx JolteonName ; name
 	db DIAMOND ; rarity
@@ -5691,7 +5691,7 @@ Jolteon1Card: ; 32912 (c:6912)
 	db 0
 
 Jolteon2Card: ; 32953 (c:6953)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Jolteon2CardGfx ; gfx
 	tx JolteonName ; name
 	db STAR ; rarity
@@ -5742,7 +5742,7 @@ Jolteon2Card: ; 32953 (c:6953)
 	db 0
 
 Zapdos1Card: ; 32994 (c:6994)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Zapdos1CardGfx ; gfx
 	tx ZapdosName ; name
 	db STAR ; rarity
@@ -5793,7 +5793,7 @@ Zapdos1Card: ; 32994 (c:6994)
 	db 0
 
 Zapdos2Card: ; 329d5 (c:69d5)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Zapdos2CardGfx ; gfx
 	tx ZapdosName ; name
 	db STAR ; rarity
@@ -5844,7 +5844,7 @@ Zapdos2Card: ; 329d5 (c:69d5)
 	db 0
 
 Zapdos3Card: ; 32a16 (c:6a16)
-	db LIGHTNING ; type
+	db TYPE_PKMN_LIGHTNING ; type
 	gfx Zapdos3CardGfx ; gfx
 	tx ZapdosName ; name
 	db STAR ; rarity
@@ -5895,7 +5895,7 @@ Zapdos3Card: ; 32a16 (c:6a16)
 	db 0
 
 SandshrewCard: ; 32a57 (c:6a57)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx SandshrewCardGfx ; gfx
 	tx SandshrewName ; name
 	db CIRCLE ; rarity
@@ -5946,7 +5946,7 @@ SandshrewCard: ; 32a57 (c:6a57)
 	db 19
 
 SandslashCard: ; 32a98 (c:6a98)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx SandslashCardGfx ; gfx
 	tx SandslashName ; name
 	db DIAMOND ; rarity
@@ -5997,7 +5997,7 @@ SandslashCard: ; 32a98 (c:6a98)
 	db 0
 
 DiglettCard: ; 32ad9 (c:6ad9)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx DiglettCardGfx ; gfx
 	tx DiglettName ; name
 	db CIRCLE ; rarity
@@ -6048,7 +6048,7 @@ DiglettCard: ; 32ad9 (c:6ad9)
 	db 19
 
 DugtrioCard: ; 32b1a (c:6b1a)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx DugtrioCardGfx ; gfx
 	tx DugtrioName ; name
 	db STAR ; rarity
@@ -6099,7 +6099,7 @@ DugtrioCard: ; 32b1a (c:6b1a)
 	db 0
 
 MankeyCard: ; 32b5b (c:6b5b)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx MankeyCardGfx ; gfx
 	tx MankeyName ; name
 	db CIRCLE ; rarity
@@ -6150,7 +6150,7 @@ MankeyCard: ; 32b5b (c:6b5b)
 	db 17
 
 PrimeapeCard: ; 32b9c (c:6b9c)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx PrimeapeCardGfx ; gfx
 	tx PrimeapeName ; name
 	db DIAMOND ; rarity
@@ -6201,7 +6201,7 @@ PrimeapeCard: ; 32b9c (c:6b9c)
 	db 0
 
 MachopCard: ; 32bdd (c:6bdd)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx MachopCardGfx ; gfx
 	tx MachopName ; name
 	db CIRCLE ; rarity
@@ -6252,7 +6252,7 @@ MachopCard: ; 32bdd (c:6bdd)
 	db 21
 
 MachokeCard: ; 32c1e (c:6c1e)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx MachokeCardGfx ; gfx
 	tx MachokeName ; name
 	db DIAMOND ; rarity
@@ -6303,7 +6303,7 @@ MachokeCard: ; 32c1e (c:6c1e)
 	db 16
 
 MachampCard: ; 32c5f (c:6c5f)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx MachampCardGfx ; gfx
 	tx MachampName ; name
 	db STAR ; rarity
@@ -6354,7 +6354,7 @@ MachampCard: ; 32c5f (c:6c5f)
 	db 0
 
 GeodudeCard: ; 32ca0 (c:6ca0)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx GeodudeCardGfx ; gfx
 	tx GeodudeName ; name
 	db CIRCLE ; rarity
@@ -6405,7 +6405,7 @@ GeodudeCard: ; 32ca0 (c:6ca0)
 	db 19
 
 GravelerCard: ; 32ce1 (c:6ce1)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx GravelerCardGfx ; gfx
 	tx GravelerName ; name
 	db DIAMOND ; rarity
@@ -6456,7 +6456,7 @@ GravelerCard: ; 32ce1 (c:6ce1)
 	db 16
 
 GolemCard: ; 32d22 (c:6d22)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx GolemCardGfx ; gfx
 	tx GolemName ; name
 	db DIAMOND ; rarity
@@ -6507,7 +6507,7 @@ GolemCard: ; 32d22 (c:6d22)
 	db 0
 
 OnixCard: ; 32d63 (c:6d63)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx OnixCardGfx ; gfx
 	tx OnixName ; name
 	db CIRCLE ; rarity
@@ -6558,7 +6558,7 @@ OnixCard: ; 32d63 (c:6d63)
 	db 0
 
 CuboneCard: ; 32da4 (c:6da4)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx CuboneCardGfx ; gfx
 	tx CuboneName ; name
 	db CIRCLE ; rarity
@@ -6609,7 +6609,7 @@ CuboneCard: ; 32da4 (c:6da4)
 	db 19
 
 Marowak1Card: ; 32de5 (c:6de5)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx Marowak1CardGfx ; gfx
 	tx MarowakName ; name
 	db DIAMOND ; rarity
@@ -6660,7 +6660,7 @@ Marowak1Card: ; 32de5 (c:6de5)
 	db 0
 
 Marowak2Card: ; 32e26 (c:6e26)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx Marowak2CardGfx ; gfx
 	tx MarowakName ; name
 	db DIAMOND ; rarity
@@ -6711,7 +6711,7 @@ Marowak2Card: ; 32e26 (c:6e26)
 	db 0
 
 HitmonleeCard: ; 32e67 (c:6e67)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx HitmonleeCardGfx ; gfx
 	tx HitmonleeName ; name
 	db STAR ; rarity
@@ -6762,7 +6762,7 @@ HitmonleeCard: ; 32e67 (c:6e67)
 	db 0
 
 HitmonchanCard: ; 32ea8 (c:6ea8)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx HitmonchanCardGfx ; gfx
 	tx HitmonchanName ; name
 	db STAR ; rarity
@@ -6813,7 +6813,7 @@ HitmonchanCard: ; 32ea8 (c:6ea8)
 	db 0
 
 RhyhornCard: ; 32ee9 (c:6ee9)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx RhyhornCardGfx ; gfx
 	tx RhyhornName ; name
 	db CIRCLE ; rarity
@@ -6864,7 +6864,7 @@ RhyhornCard: ; 32ee9 (c:6ee9)
 	db 16
 
 RhydonCard: ; 32f2a (c:6f2a)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx RhydonCardGfx ; gfx
 	tx RhydonName ; name
 	db DIAMOND ; rarity
@@ -6915,7 +6915,7 @@ RhydonCard: ; 32f2a (c:6f2a)
 	db 0
 
 KabutoCard: ; 32f6b (c:6f6b)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx KabutoCardGfx ; gfx
 	tx KabutoName ; name
 	db CIRCLE ; rarity
@@ -6966,7 +6966,7 @@ KabutoCard: ; 32f6b (c:6f6b)
 	db 19
 
 KabutopsCard: ; 32fac (c:6fac)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx KabutopsCardGfx ; gfx
 	tx KabutopsName ; name
 	db STAR ; rarity
@@ -7017,7 +7017,7 @@ KabutopsCard: ; 32fac (c:6fac)
 	db 0
 
 AerodactylCard: ; 32fed (c:6fed)
-	db FIGHTING ; type
+	db TYPE_PKMN_FIGHTING ; type
 	gfx AerodactylCardGfx ; gfx
 	tx AerodactylName ; name
 	db STAR ; rarity
@@ -7068,7 +7068,7 @@ AerodactylCard: ; 32fed (c:6fed)
 	db 1
 
 AbraCard: ; 3302e (c:702e)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx AbraCardGfx ; gfx
 	tx AbraName ; name
 	db CIRCLE ; rarity
@@ -7119,7 +7119,7 @@ AbraCard: ; 3302e (c:702e)
 	db 16
 
 KadabraCard: ; 3306f (c:706f)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx KadabraCardGfx ; gfx
 	tx KadabraName ; name
 	db DIAMOND ; rarity
@@ -7170,7 +7170,7 @@ KadabraCard: ; 3306f (c:706f)
 	db 16
 
 AlakazamCard: ; 330b0 (c:70b0)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx AlakazamCardGfx ; gfx
 	tx AlakazamName ; name
 	db STAR ; rarity
@@ -7221,7 +7221,7 @@ AlakazamCard: ; 330b0 (c:70b0)
 	db 0
 
 Slowpoke1Card: ; 330f1 (c:70f1)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx Slowpoke1CardGfx ; gfx
 	tx SlowpokeName ; name
 	db PROMOSTAR ; rarity
@@ -7272,7 +7272,7 @@ Slowpoke1Card: ; 330f1 (c:70f1)
 	db 19
 
 Slowpoke2Card: ; 33132 (c:7132)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx Slowpoke2CardGfx ; gfx
 	tx SlowpokeName ; name
 	db CIRCLE ; rarity
@@ -7323,7 +7323,7 @@ Slowpoke2Card: ; 33132 (c:7132)
 	db 16
 
 SlowbroCard: ; 33173 (c:7173)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx SlowbroCardGfx ; gfx
 	tx SlowbroName ; name
 	db DIAMOND ; rarity
@@ -7374,7 +7374,7 @@ SlowbroCard: ; 33173 (c:7173)
 	db 1
 
 Gastly1Card: ; 331b4 (c:71b4)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx Gastly1CardGfx ; gfx
 	tx GastlyName ; name
 	db CIRCLE ; rarity
@@ -7425,7 +7425,7 @@ Gastly1Card: ; 331b4 (c:71b4)
 	db 16
 
 Gastly2Card: ; 331f5 (c:71f5)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx Gastly2CardGfx ; gfx
 	tx GastlyName ; name
 	db DIAMOND ; rarity
@@ -7476,7 +7476,7 @@ Gastly2Card: ; 331f5 (c:71f5)
 	db 19
 
 Haunter1Card: ; 33236 (c:7236)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx Haunter1CardGfx ; gfx
 	tx HaunterName ; name
 	db STAR ; rarity
@@ -7527,7 +7527,7 @@ Haunter1Card: ; 33236 (c:7236)
 	db 16
 
 Haunter2Card: ; 33277 (c:7277)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx Haunter2CardGfx ; gfx
 	tx HaunterName ; name
 	db DIAMOND ; rarity
@@ -7578,7 +7578,7 @@ Haunter2Card: ; 33277 (c:7277)
 	db 16
 
 GengarCard: ; 332b8 (c:72b8)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx GengarCardGfx ; gfx
 	tx GengarName ; name
 	db STAR ; rarity
@@ -7629,7 +7629,7 @@ GengarCard: ; 332b8 (c:72b8)
 	db 1
 
 DrowzeeCard: ; 332f9 (c:72f9)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx DrowzeeCardGfx ; gfx
 	tx DrowzeeName ; name
 	db CIRCLE ; rarity
@@ -7680,7 +7680,7 @@ DrowzeeCard: ; 332f9 (c:72f9)
 	db 19
 
 HypnoCard: ; 3333a (c:733a)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx HypnoCardGfx ; gfx
 	tx HypnoName ; name
 	db STAR ; rarity
@@ -7731,7 +7731,7 @@ HypnoCard: ; 3333a (c:733a)
 	db 0
 
 MrMimeCard: ; 3337b (c:737b)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx MrMimeCardGfx ; gfx
 	tx MrMimeName ; name
 	db STAR ; rarity
@@ -7782,7 +7782,7 @@ MrMimeCard: ; 3337b (c:737b)
 	db 3
 
 JynxCard: ; 333bc (c:73bc)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx JynxCardGfx ; gfx
 	tx JynxName ; name
 	db DIAMOND ; rarity
@@ -7833,7 +7833,7 @@ JynxCard: ; 333bc (c:73bc)
 	db 0
 
 Mewtwo1Card: ; 333fd (c:73fd)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx Mewtwo1CardGfx ; gfx
 	tx MewtwoName ; name
 	db STAR ; rarity
@@ -7884,7 +7884,7 @@ Mewtwo1Card: ; 333fd (c:73fd)
 	db 0
 
 Mewtwo2Card: ; 3343e (c:743e)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx Mewtwo2CardGfx ; gfx
 	tx MewtwoName ; name
 	db PROMOSTAR ; rarity
@@ -7935,7 +7935,7 @@ Mewtwo2Card: ; 3343e (c:743e)
 	db 0
 
 Mewtwo3Card: ; 3347f (c:747f)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx Mewtwo3CardGfx ; gfx
 	tx MewtwoName ; name
 	db PROMOSTAR ; rarity
@@ -7986,7 +7986,7 @@ Mewtwo3Card: ; 3347f (c:747f)
 	db 0
 
 Mew1Card: ; 334c0 (c:74c0)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx Mew1CardGfx ; gfx
 	tx MewName ; name
 	db PROMOSTAR ; rarity
@@ -8037,7 +8037,7 @@ Mew1Card: ; 334c0 (c:74c0)
 	db 3
 
 Mew2Card: ; 33501 (c:7501)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx Mew2CardGfx ; gfx
 	tx MewName ; name
 	db STAR ; rarity
@@ -8088,7 +8088,7 @@ Mew2Card: ; 33501 (c:7501)
 	db 0
 
 Mew3Card: ; 33542 (c:7542)
-	db PSYCHIC ; type
+	db TYPE_PKMN_PSYCHIC ; type
 	gfx Mew3CardGfx ; gfx
 	tx MewName ; name
 	db STAR ; rarity
@@ -8139,7 +8139,7 @@ Mew3Card: ; 33542 (c:7542)
 	db 8
 
 PidgeyCard: ; 33583 (c:7583)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx PidgeyCardGfx ; gfx
 	tx PidgeyName ; name
 	db CIRCLE ; rarity
@@ -8190,7 +8190,7 @@ PidgeyCard: ; 33583 (c:7583)
 	db 18
 
 PidgeottoCard: ; 335c4 (c:75c4)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx PidgeottoCardGfx ; gfx
 	tx PidgeottoName ; name
 	db STAR ; rarity
@@ -8241,7 +8241,7 @@ PidgeottoCard: ; 335c4 (c:75c4)
 	db 16
 
 Pidgeot1Card: ; 33605 (c:7605)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx Pidgeot1CardGfx ; gfx
 	tx PidgeotName ; name
 	db STAR ; rarity
@@ -8292,7 +8292,7 @@ Pidgeot1Card: ; 33605 (c:7605)
 	db 0
 
 Pidgeot2Card: ; 33646 (c:7646)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx Pidgeot2CardGfx ; gfx
 	tx PidgeotName ; name
 	db STAR ; rarity
@@ -8343,7 +8343,7 @@ Pidgeot2Card: ; 33646 (c:7646)
 	db 0
 
 RattataCard: ; 33687 (c:7687)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx RattataCardGfx ; gfx
 	tx RattataName ; name
 	db CIRCLE ; rarity
@@ -8394,7 +8394,7 @@ RattataCard: ; 33687 (c:7687)
 	db 19
 
 RaticateCard: ; 336c8 (c:76c8)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx RaticateCardGfx ; gfx
 	tx RaticateName ; name
 	db DIAMOND ; rarity
@@ -8445,7 +8445,7 @@ RaticateCard: ; 336c8 (c:76c8)
 	db 3
 
 SpearowCard: ; 33709 (c:7709)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx SpearowCardGfx ; gfx
 	tx SpearowName ; name
 	db CIRCLE ; rarity
@@ -8496,7 +8496,7 @@ SpearowCard: ; 33709 (c:7709)
 	db 19
 
 FearowCard: ; 3374a (c:774a)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx FearowCardGfx ; gfx
 	tx FearowName ; name
 	db DIAMOND ; rarity
@@ -8547,7 +8547,7 @@ FearowCard: ; 3374a (c:774a)
 	db 0
 
 ClefairyCard: ; 3378b (c:778b)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx ClefairyCardGfx ; gfx
 	tx ClefairyName ; name
 	db STAR ; rarity
@@ -8598,7 +8598,7 @@ ClefairyCard: ; 3378b (c:778b)
 	db 18
 
 ClefableCard: ; 337cc (c:77cc)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx ClefableCardGfx ; gfx
 	tx ClefableName ; name
 	db STAR ; rarity
@@ -8649,7 +8649,7 @@ ClefableCard: ; 337cc (c:77cc)
 	db 0
 
 Jigglypuff1Card: ; 3380d (c:780d)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx Jigglypuff1CardGfx ; gfx
 	tx JigglypuffName ; name
 	db PROMOSTAR ; rarity
@@ -8700,7 +8700,7 @@ Jigglypuff1Card: ; 3380d (c:780d)
 	db 16
 
 Jigglypuff2Card: ; 3384e (c:784e)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx Jigglypuff2CardGfx ; gfx
 	tx JigglypuffName ; name
 	db CIRCLE ; rarity
@@ -8751,7 +8751,7 @@ Jigglypuff2Card: ; 3384e (c:784e)
 	db 16
 
 Jigglypuff3Card: ; 3388f (c:788f)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx Jigglypuff3CardGfx ; gfx
 	tx JigglypuffName ; name
 	db CIRCLE ; rarity
@@ -8802,7 +8802,7 @@ Jigglypuff3Card: ; 3388f (c:788f)
 	db 16
 
 WigglytuffCard: ; 338d0 (c:78d0)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx WigglytuffCardGfx ; gfx
 	tx WigglytuffName ; name
 	db STAR ; rarity
@@ -8853,7 +8853,7 @@ WigglytuffCard: ; 338d0 (c:78d0)
 	db 0
 
 Meowth1Card: ; 33911 (c:7911)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx Meowth1CardGfx ; gfx
 	tx MeowthName ; name
 	db CIRCLE ; rarity
@@ -8904,7 +8904,7 @@ Meowth1Card: ; 33911 (c:7911)
 	db 16
 
 Meowth2Card: ; 33952 (c:7952)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx Meowth2CardGfx ; gfx
 	tx MeowthName ; name
 	db CIRCLE ; rarity
@@ -8955,7 +8955,7 @@ Meowth2Card: ; 33952 (c:7952)
 	db 16
 
 PersianCard: ; 33993 (c:7993)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx PersianCardGfx ; gfx
 	tx PersianName ; name
 	db DIAMOND ; rarity
@@ -9006,7 +9006,7 @@ PersianCard: ; 33993 (c:7993)
 	db 0
 
 FarfetchdCard: ; 339d4 (c:79d4)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx FarfetchdCardGfx ; gfx
 	tx FarfetchdName ; name
 	db DIAMOND ; rarity
@@ -9057,7 +9057,7 @@ FarfetchdCard: ; 339d4 (c:79d4)
 	db 3
 
 DoduoCard: ; 33a15 (c:7a15)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx DoduoCardGfx ; gfx
 	tx DoduoName ; name
 	db CIRCLE ; rarity
@@ -9108,7 +9108,7 @@ DoduoCard: ; 33a15 (c:7a15)
 	db 19
 
 DodrioCard: ; 33a56 (c:7a56)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx DodrioCardGfx ; gfx
 	tx DodrioName ; name
 	db DIAMOND ; rarity
@@ -9159,7 +9159,7 @@ DodrioCard: ; 33a56 (c:7a56)
 	db 1
 
 LickitungCard: ; 33a97 (c:7a97)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx LickitungCardGfx ; gfx
 	tx LickitungName ; name
 	db DIAMOND ; rarity
@@ -9210,7 +9210,7 @@ LickitungCard: ; 33a97 (c:7a97)
 	db 0
 
 ChanseyCard: ; 33ad8 (c:7ad8)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx ChanseyCardGfx ; gfx
 	tx ChanseyName ; name
 	db STAR ; rarity
@@ -9261,7 +9261,7 @@ ChanseyCard: ; 33ad8 (c:7ad8)
 	db 8
 
 KangaskhanCard: ; 33b19 (c:7b19)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx KangaskhanCardGfx ; gfx
 	tx KangaskhanName ; name
 	db STAR ; rarity
@@ -9312,7 +9312,7 @@ KangaskhanCard: ; 33b19 (c:7b19)
 	db 0
 
 TaurosCard: ; 33b5a (c:7b5a)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx TaurosCardGfx ; gfx
 	tx TaurosName ; name
 	db DIAMOND ; rarity
@@ -9363,7 +9363,7 @@ TaurosCard: ; 33b5a (c:7b5a)
 	db 0
 
 DittoCard: ; 33b9b (c:7b9b)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx DittoCardGfx ; gfx
 	tx DittoName ; name
 	db STAR ; rarity
@@ -9414,7 +9414,7 @@ DittoCard: ; 33b9b (c:7b9b)
 	db 0
 
 EeveeCard: ; 33bdc (c:7bdc)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx EeveeCardGfx ; gfx
 	tx EeveeName ; name
 	db CIRCLE ; rarity
@@ -9465,7 +9465,7 @@ EeveeCard: ; 33bdc (c:7bdc)
 	db 17
 
 PorygonCard: ; 33c1d (c:7c1d)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx PorygonCardGfx ; gfx
 	tx PorygonName ; name
 	db DIAMOND ; rarity
@@ -9516,7 +9516,7 @@ PorygonCard: ; 33c1d (c:7c1d)
 	db 0
 
 SnorlaxCard: ; 33c5e (c:7c5e)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx SnorlaxCardGfx ; gfx
 	tx SnorlaxName ; name
 	db STAR ; rarity
@@ -9567,7 +9567,7 @@ SnorlaxCard: ; 33c5e (c:7c5e)
 	db 0
 
 DratiniCard: ; 33c9f (c:7c9f)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx DratiniCardGfx ; gfx
 	tx DratiniName ; name
 	db DIAMOND ; rarity
@@ -9618,7 +9618,7 @@ DratiniCard: ; 33c9f (c:7c9f)
 	db 18
 
 DragonairCard: ; 33ce0 (c:7ce0)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx DragonairCardGfx ; gfx
 	tx DragonairName ; name
 	db STAR ; rarity
@@ -9669,7 +9669,7 @@ DragonairCard: ; 33ce0 (c:7ce0)
 	db 16
 
 Dragonite1Card: ; 33d21 (c:7d21)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx Dragonite1CardGfx ; gfx
 	tx DragoniteName ; name
 	db STAR ; rarity
@@ -9720,7 +9720,7 @@ Dragonite1Card: ; 33d21 (c:7d21)
 	db 0
 
 Dragonite2Card: ; 33d62 (c:7d62)
-	db COLORLESS ; type
+	db TYPE_PKMN_COLORLESS ; type
 	gfx Dragonite2CardGfx ; gfx
 	tx DragoniteName ; name
 	db STAR ; rarity
@@ -9771,7 +9771,7 @@ Dragonite2Card: ; 33d62 (c:7d62)
 	db 0
 
 GrassEnergyCard: ; 33da3 (c:7da3)
-	db GRASS_ENERGY_CARD ; type
+	db TYPE_ENERGY_GRASS ; type
 	gfx GrassEnergyCardGfx ; gfx
 	tx GrassEnergyName ; name
 	db CIRCLE ; rarity
@@ -9782,7 +9782,7 @@ GrassEnergyCard: ; 33da3 (c:7da3)
 	dw NONE ; description (cont)
 
 FireEnergyCard: ; 33db1 (c:7db1)
-	db FIRE_ENERGY_CARD ; type
+	db TYPE_ENERGY_FIRE ; type
 	gfx FireEnergyCardGfx ; gfx
 	tx FireEnergyName ; name
 	db CIRCLE ; rarity
@@ -9793,7 +9793,7 @@ FireEnergyCard: ; 33db1 (c:7db1)
 	dw NONE ; description (cont)
 
 WaterEnergyCard: ; 33dbf (c:7dbf)
-	db WATER_ENERGY_CARD ; type
+	db TYPE_ENERGY_WATER ; type
 	gfx WaterEnergyCardGfx ; gfx
 	tx WaterEnergyName ; name
 	db CIRCLE ; rarity
@@ -9804,7 +9804,7 @@ WaterEnergyCard: ; 33dbf (c:7dbf)
 	dw NONE ; description (cont)
 
 LightningEnergyCard: ; 33dcd (c:7dcd)
-	db LIGHTNING_ENERGY_CARD ; type
+	db TYPE_ENERGY_LIGHTNING ; type
 	gfx LightningEnergyCardGfx ; gfx
 	tx LightningEnergyName ; name
 	db CIRCLE ; rarity
@@ -9815,7 +9815,7 @@ LightningEnergyCard: ; 33dcd (c:7dcd)
 	dw NONE ; description (cont)
 
 FightingEnergyCard: ; 33ddb (c:7ddb)
-	db FIGHTING_ENERGY_CARD ; type
+	db TYPE_ENERGY_FIGHTING ; type
 	gfx FightingEnergyCardGfx ; gfx
 	tx FightingEnergyName ; name
 	db CIRCLE ; rarity
@@ -9826,7 +9826,7 @@ FightingEnergyCard: ; 33ddb (c:7ddb)
 	dw NONE ; description (cont)
 
 PsychicEnergyCard: ; 33de9 (c:7de9)
-	db PSYCHIC_ENERGY_CARD ; type
+	db TYPE_ENERGY_PSYCHIC ; type
 	gfx PsychicEnergyCardGfx ; gfx
 	tx PsychicEnergyName ; name
 	db CIRCLE ; rarity
@@ -9837,7 +9837,7 @@ PsychicEnergyCard: ; 33de9 (c:7de9)
 	dw NONE ; description (cont)
 
 DoubleColorlessEnergyCard: ; 33df7 (c:7df7)
-	db DOUBLE_COLORLESS_ENERGY_CARD ; type
+	db TYPE_ENERGY_DOUBLE_COLORLESS ; type
 	gfx DoubleColorlessEnergyCardGfx ; gfx
 	tx DoubleColorlessEnergyName ; name
 	db DIAMOND ; rarity
@@ -9848,7 +9848,7 @@ DoubleColorlessEnergyCard: ; 33df7 (c:7df7)
 	dw NONE ; description (cont)
 
 ProfessorOakCard: ; 33e05 (c:7e05)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx ProfessorOakCardGfx ; gfx
 	tx ProfessorOakName ; name
 	db DIAMOND ; rarity
@@ -9859,7 +9859,7 @@ ProfessorOakCard: ; 33e05 (c:7e05)
 	dw NONE ; description (cont)
 
 ImposterProfessorOakCard: ; 33e13 (c:7e13)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx ImposterProfessorOakCardGfx ; gfx
 	tx ImposterProfessorOakName ; name
 	db STAR ; rarity
@@ -9870,7 +9870,7 @@ ImposterProfessorOakCard: ; 33e13 (c:7e13)
 	dw NONE ; description (cont)
 
 BillCard: ; 33e21 (c:7e21)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx BillCardGfx ; gfx
 	tx BillName ; name
 	db CIRCLE ; rarity
@@ -9881,7 +9881,7 @@ BillCard: ; 33e21 (c:7e21)
 	dw NONE ; description (cont)
 
 MrFujiCard: ; 33e2f (c:7e2f)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx MrFujiCardGfx ; gfx
 	tx MrFujiName ; name
 	db DIAMOND ; rarity
@@ -9892,7 +9892,7 @@ MrFujiCard: ; 33e2f (c:7e2f)
 	dw NONE ; description (cont)
 
 LassCard: ; 33e3d (c:7e3d)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx LassCardGfx ; gfx
 	tx LassName ; name
 	db STAR ; rarity
@@ -9903,7 +9903,7 @@ LassCard: ; 33e3d (c:7e3d)
 	dw NONE ; description (cont)
 
 ImakuniCard: ; 33e4b (c:7e4b)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx ImakuniCardGfx ; gfx
 	tx ImakuniName ; name
 	db PROMOSTAR ; rarity
@@ -9914,7 +9914,7 @@ ImakuniCard: ; 33e4b (c:7e4b)
 	dw NONE ; description (cont)
 
 PokemonTraderCard: ; 33e59 (c:7e59)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx PokemonTraderCardGfx ; gfx
 	tx PokemonTraderName ; name
 	db STAR ; rarity
@@ -9925,7 +9925,7 @@ PokemonTraderCard: ; 33e59 (c:7e59)
 	dw NONE ; description (cont)
 
 PokemonBreederCard: ; 33e67 (c:7e67)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx PokemonBreederCardGfx ; gfx
 	tx PokemonBreederName ; name
 	db STAR ; rarity
@@ -9936,7 +9936,7 @@ PokemonBreederCard: ; 33e67 (c:7e67)
 	dw NONE ; description (cont)
 
 ClefairyDollCard: ; 33e75 (c:7e75)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx ClefairyDollCardGfx ; gfx
 	tx ClefairyDollName ; name
 	db STAR ; rarity
@@ -9947,7 +9947,7 @@ ClefairyDollCard: ; 33e75 (c:7e75)
 	tx ClefairyDollDescriptionCont ; description (cont)
 
 MysteriousFossilCard: ; 33e83 (c:7e83)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx MysteriousFossilCardGfx ; gfx
 	tx MysteriousFossilName ; name
 	db CIRCLE ; rarity
@@ -9958,7 +9958,7 @@ MysteriousFossilCard: ; 33e83 (c:7e83)
 	tx MysteriousFossilDescriptionCont ; description (cont)
 
 EnergyRetrievalCard: ; 33e91 (c:7e91)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx EnergyRetrievalCardGfx ; gfx
 	tx EnergyRetrievalName ; name
 	db DIAMOND ; rarity
@@ -9969,7 +9969,7 @@ EnergyRetrievalCard: ; 33e91 (c:7e91)
 	dw NONE ; description (cont)
 
 SuperEnergyRetrievalCard: ; 33e9f (c:7e9f)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx SuperEnergyRetrievalCardGfx ; gfx
 	tx SuperEnergyRetrievalName ; name
 	db PROMOSTAR ; rarity
@@ -9980,7 +9980,7 @@ SuperEnergyRetrievalCard: ; 33e9f (c:7e9f)
 	dw NONE ; description (cont)
 
 EnergySearchCard: ; 33ead (c:7ead)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx EnergySearchCardGfx ; gfx
 	tx EnergySearchName ; name
 	db CIRCLE ; rarity
@@ -9991,7 +9991,7 @@ EnergySearchCard: ; 33ead (c:7ead)
 	dw NONE ; description (cont)
 
 EnergyRemovalCard: ; 33ebb (c:7ebb)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx EnergyRemovalCardGfx ; gfx
 	tx EnergyRemovalName ; name
 	db CIRCLE ; rarity
@@ -10002,7 +10002,7 @@ EnergyRemovalCard: ; 33ebb (c:7ebb)
 	dw NONE ; description (cont)
 
 SuperEnergyRemovalCard: ; 33ec9 (c:7ec9)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx SuperEnergyRemovalCardGfx ; gfx
 	tx SuperEnergyRemovalName ; name
 	db STAR ; rarity
@@ -10013,7 +10013,7 @@ SuperEnergyRemovalCard: ; 33ec9 (c:7ec9)
 	dw NONE ; description (cont)
 
 SwitchCard: ; 33ed7 (c:7ed7)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx SwitchCardGfx ; gfx
 	tx SwitchName ; name
 	db CIRCLE ; rarity
@@ -10024,7 +10024,7 @@ SwitchCard: ; 33ed7 (c:7ed7)
 	dw NONE ; description (cont)
 
 PokemonCenterCard: ; 33ee5 (c:7ee5)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx PokemonCenterCardGfx ; gfx
 	tx PokemonCenterName ; name
 	db DIAMOND ; rarity
@@ -10035,7 +10035,7 @@ PokemonCenterCard: ; 33ee5 (c:7ee5)
 	dw NONE ; description (cont)
 
 PokeBallCard: ; 33ef3 (c:7ef3)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx PokeBallCardGfx ; gfx
 	tx PokeBallName ; name
 	db CIRCLE ; rarity
@@ -10046,7 +10046,7 @@ PokeBallCard: ; 33ef3 (c:7ef3)
 	dw NONE ; description (cont)
 
 ScoopUpCard: ; 33f01 (c:7f01)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx ScoopUpCardGfx ; gfx
 	tx ScoopUpName ; name
 	db STAR ; rarity
@@ -10057,7 +10057,7 @@ ScoopUpCard: ; 33f01 (c:7f01)
 	dw NONE ; description (cont)
 
 ComputerSearchCard: ; 33f0f (c:7f0f)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx ComputerSearchCardGfx ; gfx
 	tx ComputerSearchName ; name
 	db STAR ; rarity
@@ -10068,7 +10068,7 @@ ComputerSearchCard: ; 33f0f (c:7f0f)
 	dw NONE ; description (cont)
 
 PokedexCard: ; 33f1d (c:7f1d)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx PokedexCardGfx ; gfx
 	tx PokedexName ; name
 	db DIAMOND ; rarity
@@ -10079,7 +10079,7 @@ PokedexCard: ; 33f1d (c:7f1d)
 	dw NONE ; description (cont)
 
 PlusPowerCard: ; 33f2b (c:7f2b)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx PlusPowerCardGfx ; gfx
 	tx PlusPowerName ; name
 	db DIAMOND ; rarity
@@ -10090,7 +10090,7 @@ PlusPowerCard: ; 33f2b (c:7f2b)
 	dw NONE ; description (cont)
 
 DefenderCard: ; 33f39 (c:7f39)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx DefenderCardGfx ; gfx
 	tx DefenderName ; name
 	db DIAMOND ; rarity
@@ -10101,7 +10101,7 @@ DefenderCard: ; 33f39 (c:7f39)
 	dw NONE ; description (cont)
 
 ItemFinderCard: ; 33f47 (c:7f47)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx ItemFinderCardGfx ; gfx
 	tx ItemFinderName ; name
 	db STAR ; rarity
@@ -10112,7 +10112,7 @@ ItemFinderCard: ; 33f47 (c:7f47)
 	dw NONE ; description (cont)
 
 GustofWindCard: ; 33f55 (c:7f55)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx GustofWindCardGfx ; gfx
 	tx GustofWindName ; name
 	db CIRCLE ; rarity
@@ -10123,7 +10123,7 @@ GustofWindCard: ; 33f55 (c:7f55)
 	dw NONE ; description (cont)
 
 DevolutionSprayCard: ; 33f63 (c:7f63)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx DevolutionSprayCardGfx ; gfx
 	tx DevolutionSprayName ; name
 	db STAR ; rarity
@@ -10134,7 +10134,7 @@ DevolutionSprayCard: ; 33f63 (c:7f63)
 	tx DevolutionSprayDescriptionCont ; description (cont)
 
 PotionCard: ; 33f71 (c:7f71)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx PotionCardGfx ; gfx
 	tx PotionName ; name
 	db CIRCLE ; rarity
@@ -10145,7 +10145,7 @@ PotionCard: ; 33f71 (c:7f71)
 	dw NONE ; description (cont)
 
 SuperPotionCard: ; 33f7f (c:7f7f)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx SuperPotionCardGfx ; gfx
 	tx SuperPotionName ; name
 	db DIAMOND ; rarity
@@ -10156,7 +10156,7 @@ SuperPotionCard: ; 33f7f (c:7f7f)
 	dw NONE ; description (cont)
 
 FullHealCard: ; 33f8d (c:7f8d)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx FullHealCardGfx ; gfx
 	tx FullHealName ; name
 	db DIAMOND ; rarity
@@ -10167,7 +10167,7 @@ FullHealCard: ; 33f8d (c:7f8d)
 	dw NONE ; description (cont)
 
 ReviveCard: ; 33f9b (c:7f9b)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx ReviveCardGfx ; gfx
 	tx ReviveName ; name
 	db DIAMOND ; rarity
@@ -10178,7 +10178,7 @@ ReviveCard: ; 33f9b (c:7f9b)
 	dw NONE ; description (cont)
 
 MaintenanceCard: ; 33fa9 (c:7fa9)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx MaintenanceCardGfx ; gfx
 	tx MaintenanceName ; name
 	db DIAMOND ; rarity
@@ -10189,7 +10189,7 @@ MaintenanceCard: ; 33fa9 (c:7fa9)
 	dw NONE ; description (cont)
 
 PokemonFluteCard: ; 33fb7 (c:7fb7)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx PokemonFluteCardGfx ; gfx
 	tx PokemonFluteName ; name
 	db DIAMOND ; rarity
@@ -10200,7 +10200,7 @@ PokemonFluteCard: ; 33fb7 (c:7fb7)
 	dw NONE ; description (cont)
 
 GamblerCard: ; 33fc5 (c:7fc5)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx GamblerCardGfx ; gfx
 	tx GamblerName ; name
 	db CIRCLE ; rarity
@@ -10211,7 +10211,7 @@ GamblerCard: ; 33fc5 (c:7fc5)
 	dw NONE ; description (cont)
 
 RecycleCard: ; 33fd3 (c:7fd3)
-	db TRAINER_CARD ; type
+	db TYPE_TRAINER ; type
 	gfx RecycleCardGfx ; gfx
 	tx RecycleName ; name
 	db CIRCLE ; rarity
-- 
cgit v1.2.3


From ba9075ff6e0537ab27e40a233aa28a976b0731d1 Mon Sep 17 00:00:00 2001
From: xCrystal <rgr.crystal@gmail.com>
Date: Thu, 8 Feb 2018 00:20:20 +0100
Subject: Move booster pack data to data/

---
 src/data/booster_packs.asm | 448 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 448 insertions(+)
 create mode 100644 src/data/booster_packs.asm

(limited to 'src/data')

diff --git a/src/data/booster_packs.asm b/src/data/booster_packs.asm
new file mode 100644
index 0000000..8f8d8c2
--- /dev/null
+++ b/src/data/booster_packs.asm
@@ -0,0 +1,448 @@
+BoosterSetRarityAmountTable: ; 1e4d4 (7::64d4)
+; energies, commons, uncommons, rares
+; commons + uncommons + rares needs to be equal to 10 minus the number of energy cards
+; defined in the pack's data below; otherwise, the number of cards in the pack won't be 10.
+	db $01, $05, $03, $01 ; COLOSSEUM >> 4
+	db $01, $05, $03, $01 ; EVOLUTION >> 4
+	db $00, $06, $03, $01 ; MYSTERY >> 4
+	db $00, $06, $03, $01 ; LABORATORY >> 4
+
+; For the energy or energy generation function, there are three options:
+; - Ponter to a function that generates energies (some generate one, some generate a full pack)
+; - A single energy of a specific type
+; - $0000 if no card in the pack is an energy
+
+PackColosseumNeutral:: ; 1e4e4 (7:64e4)
+	db COLOSSEUM >> 4 ; booster pack set
+	dw GenerateEndingEnergy ; energy or energy generation function
+
+; Card Type Chances
+	db $14 ; Grass Type Chance
+	db $14 ; Fire Type Chance
+	db $14 ; Water Type Chance
+	db $14 ; Lightning Type Chance
+	db $14 ; Fighting Type Chance
+	db $14 ; Psychic Type Chance
+	db $14 ; Colorless Type Chance
+	db $14 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackColosseumGrass:: ; 1e4f0 (7:64f0)
+	db COLOSSEUM >> 4 ; booster pack set
+	dw GRASS_ENERGY  ; energy or energy generation function
+
+; Card Type Chances
+	db $30 ; Grass Type Chance
+	db $10 ; Fire Type Chance
+	db $10 ; Water Type Chance
+	db $10 ; Lightning Type Chance
+	db $10 ; Fighting Type Chance
+	db $10 ; Psychic Type Chance
+	db $10 ; Colorless Type Chance
+	db $10 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackColosseumFire:: ; 1e4fc (7:64fc)
+	db COLOSSEUM >> 4 ; booster pack set
+	dw FIRE_ENERGY  ; energy or energy generation function
+
+; Card Type Chances
+	db $10 ; Grass Type Chance
+	db $30 ; Fire Type Chance
+	db $10 ; Water Type Chance
+	db $10 ; Lightning Type Chance
+	db $10 ; Fighting Type Chance
+	db $10 ; Psychic Type Chance
+	db $10 ; Colorless Type Chance
+	db $10 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackColosseumWater:: ; 1e508 (7:6508)
+	db COLOSSEUM >> 4 ; booster pack set
+	dw WATER_ENERGY ; energy or energy generation function
+
+; Card Type Chances
+	db $10 ; Grass Type Chance
+	db $10 ; Fire Type Chance
+	db $30 ; Water Type Chance
+	db $10 ; Lightning Type Chance
+	db $10 ; Fighting Type Chance
+	db $10 ; Psychic Type Chance
+	db $10 ; Colorless Type Chance
+	db $10 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackColosseumLightning:: ; 1e514 (7:6514)
+	db COLOSSEUM >> 4 ; booster pack set
+	dw LIGHTNING_ENERGY ; energy or energy generation function
+
+; Card Type Chances
+	db $10 ; Grass Type Chance
+	db $10 ; Fire Type Chance
+	db $10 ; Water Type Chance
+	db $30 ; Lightning Type Chance
+	db $10 ; Fighting Type Chance
+	db $10 ; Psychic Type Chance
+	db $10 ; Colorless Type Chance
+	db $10 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackColosseumFighting:: ; 1e520 (7:6520)
+	db COLOSSEUM >> 4 ; booster pack set
+	dw FIGHTING_ENERGY ; energy or energy generation function
+
+; Card Type Chances
+	db $10 ; Grass Type Chance
+	db $10 ; Fire Type Chance
+	db $10 ; Water Type Chance
+	db $10 ; Lightning Type Chance
+	db $30 ; Fighting Type Chance
+	db $10 ; Psychic Type Chance
+	db $10 ; Colorless Type Chance
+	db $10 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackColosseumTrainer:: ; 1e52c (7:652c)
+	db COLOSSEUM >> 4 ; booster pack set
+	dw GenerateEndingEnergy ; energy or energy generation function
+
+; Card Type Chances
+	db $10 ; Grass Type Chance
+	db $10 ; Fire Type Chance
+	db $10 ; Water Type Chance
+	db $10 ; Lightning Type Chance
+	db $10 ; Fighting Type Chance
+	db $10 ; Psychic Type Chance
+	db $10 ; Colorless Type Chance
+	db $30 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackEvolutionNeutral:: ; 1e538 (7:6538)
+	db EVOLUTION >> 4 ; booster pack set
+	dw GenerateEndingEnergy ; energy or energy generation function
+
+; Card Type Chances
+	db $14 ; Grass Type Chance
+	db $14 ; Fire Type Chance
+	db $14 ; Water Type Chance
+	db $14 ; Lightning Type Chance
+	db $14 ; Fighting Type Chance
+	db $14 ; Psychic Type Chance
+	db $14 ; Colorless Type Chance
+	db $14 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackEvolutionGrass:: ; 1e544 (7:6544)
+	db EVOLUTION >> 4 ; booster pack set
+	dw GRASS_ENERGY ; energy or energy generation function
+
+; Card Type Chances
+	db $30 ; Grass Type Chance
+	db $10 ; Fire Type Chance
+	db $10 ; Water Type Chance
+	db $10 ; Lightning Type Chance
+	db $10 ; Fighting Type Chance
+	db $10 ; Psychic Type Chance
+	db $10 ; Colorless Type Chance
+	db $10 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackEvolutionNeutralFireEnergy:: ; 1e550 (7:6550)
+	db EVOLUTION >> 4 ; booster pack set
+	dw FIRE_ENERGY ; energy or energy generation function
+
+; Card Type Chances
+	db $14 ; Grass Type Chance
+	db $14 ; Fire Type Chance
+	db $14 ; Water Type Chance
+	db $14 ; Lightning Type Chance
+	db $14 ; Fighting Type Chance
+	db $14 ; Psychic Type Chance
+	db $14 ; Colorless Type Chance
+	db $14 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackEvolutionWater:: ; 1e55c (7:655c)
+	db EVOLUTION >> 4 ; booster pack set
+	dw WATER_ENERGY ; energy or energy generation function
+
+; Card Type Chances
+	db $10 ; Grass Type Chance
+	db $10 ; Fire Type Chance
+	db $30 ; Water Type Chance
+	db $10 ; Lightning Type Chance
+	db $10 ; Fighting Type Chance
+	db $10 ; Psychic Type Chance
+	db $10 ; Colorless Type Chance
+	db $10 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackEvolutionFighting:: ; 1e568 (7:6568)
+	db EVOLUTION >> 4 ; booster pack set
+	dw FIGHTING_ENERGY ; energy or energy generation function
+
+; Card Type Chances
+	db $10 ; Grass Type Chance
+	db $10 ; Fire Type Chance
+	db $10 ; Water Type Chance
+	db $10 ; Lightning Type Chance
+	db $30 ; Fighting Type Chance
+	db $10 ; Psychic Type Chance
+	db $10 ; Colorless Type Chance
+	db $10 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackEvolutionPsychic:: ; 1e574 (7:6574)
+	db EVOLUTION >> 4 ; booster pack set
+	dw PSYCHIC_ENERGY ; energy or energy generation function
+
+; Card Type Chances
+	db $10 ; Grass Type Chance
+	db $10 ; Fire Type Chance
+	db $10 ; Water Type Chance
+	db $10 ; Lightning Type Chance
+	db $10 ; Fighting Type Chance
+	db $30 ; Psychic Type Chance
+	db $10 ; Colorless Type Chance
+	db $10 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackEvolutionTrainer:: ; 1e580 (7:6580)
+	db EVOLUTION >> 4 ; booster pack set
+	dw GenerateEndingEnergy ; energy or energy generation function
+
+; Card Type Chances
+	db $10 ; Grass Type Chance
+	db $10 ; Fire Type Chance
+	db $10 ; Water Type Chance
+	db $10 ; Lightning Type Chance
+	db $10 ; Fighting Type Chance
+	db $10 ; Psychic Type Chance
+	db $10 ; Colorless Type Chance
+	db $30 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackMysteryNeutral:: ; 1e58c (7:658c)
+	db MYSTERY >> 4 ; booster pack set
+	dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+	db $11 ; Grass Type Chance
+	db $11 ; Fire Type Chance
+	db $11 ; Water Type Chance
+	db $11 ; Lightning Type Chance
+	db $11 ; Fighting Type Chance
+	db $11 ; Psychic Type Chance
+	db $11 ; Colorless Type Chance
+	db $11 ; Trainer Card Chance
+	db $11 ; Energy Card Chance
+
+PackMysteryGrassColorless:: ; 1e598 (7:6598)
+	db MYSTERY >> 4 ; booster pack set
+	dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+	db $30 ; Grass Type Chance
+	db $0C ; Fire Type Chance
+	db $0C ; Water Type Chance
+	db $0C ; Lightning Type Chance
+	db $0C ; Fighting Type Chance
+	db $0C ; Psychic Type Chance
+	db $16 ; Colorless Type Chance
+	db $0C ; Trainer Card Chance
+	db $0C ; Energy Card Chance
+
+PackMysteryWaterColorless:: ; 1e5a4 (7:65a4)
+	db MYSTERY >> 4 ; booster pack set
+	dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+	db $0C ; Grass Type Chance
+	db $0C ; Fire Type Chance
+	db $30 ; Water Type Chance
+	db $0C ; Lightning Type Chance
+	db $0C ; Fighting Type Chance
+	db $0C ; Psychic Type Chance
+	db $16 ; Colorless Type Chance
+	db $0C ; Trainer Card Chance
+	db $0C ; Energy Card Chance
+
+PackMysteryLightningColorless:: ; 1e5b0 (7:65b0)
+	db MYSTERY >> 4 ; booster pack set
+	dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+	db $0C ; Grass Type Chance
+	db $0C ; Fire Type Chance
+	db $0C ; Water Type Chance
+	db $30 ; Lightning Type Chance
+	db $0C ; Fighting Type Chance
+	db $0C ; Psychic Type Chance
+	db $16 ; Colorless Type Chance
+	db $0C ; Trainer Card Chance
+	db $0C ; Energy Card Chance
+
+PackMysteryFightingColorless:: ; 1e5bc (7:65bc)
+	db MYSTERY >> 4 ; booster pack set
+	dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+	db $0C ; Grass Type Chance
+	db $0C ; Fire Type Chance
+	db $0C ; Water Type Chance
+	db $0C ; Lightning Type Chance
+	db $30 ; Fighting Type Chance
+	db $0C ; Psychic Type Chance
+	db $16 ; Colorless Type Chance
+	db $0C ; Trainer Card Chance
+	db $0C ; Energy Card Chance
+
+PackMysteryTrainerColorless:: ; 1e5c8 (7:65c8)
+	db MYSTERY >> 4 ; booster pack set
+	dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+	db $0C ; Grass Type Chance
+	db $0C ; Fire Type Chance
+	db $0C ; Water Type Chance
+	db $0C ; Lightning Type Chance
+	db $0C ; Fighting Type Chance
+	db $0C ; Psychic Type Chance
+	db $16 ; Colorless Type Chance
+	db $30 ; Trainer Card Chance
+	db $0C ; Energy Card Chance
+
+PackLaboratoryMostlyNeutral:: ; 1e5d4 (7:65d4)
+	db LABORATORY >> 4 ; booster pack set
+	dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+	db $14 ; Grass Type Chance
+	db $14 ; Fire Type Chance
+	db $14 ; Water Type Chance
+	db $14 ; Lightning Type Chance
+	db $10 ; Fighting Type Chance
+	db $14 ; Psychic Type Chance
+	db $14 ; Colorless Type Chance
+	db $18 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackLaboratoryGrass:: ; 1e5e0 (7:65e0)
+	db LABORATORY >> 4 ; booster pack set
+	dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+	db $30 ; Grass Type Chance
+	db $10 ; Fire Type Chance
+	db $10 ; Water Type Chance
+	db $10 ; Lightning Type Chance
+	db $10 ; Fighting Type Chance
+	db $10 ; Psychic Type Chance
+	db $10 ; Colorless Type Chance
+	db $10 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackLaboratoryWater:: ; 1e5ec (7:65ec)
+	db LABORATORY >> 4 ; booster pack set
+	dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+	db $10 ; Grass Type Chance
+	db $10 ; Fire Type Chance
+	db $30 ; Water Type Chance
+	db $10 ; Lightning Type Chance
+	db $10 ; Fighting Type Chance
+	db $10 ; Psychic Type Chance
+	db $10 ; Colorless Type Chance
+	db $10 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackLaboratoryPsychic:: ; 1e5f8 (7:65f8)
+	db LABORATORY >> 4 ; booster pack set
+	dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+	db $10 ; Grass Type Chance
+	db $10 ; Fire Type Chance
+	db $10 ; Water Type Chance
+	db $10 ; Lightning Type Chance
+	db $10 ; Fighting Type Chance
+	db $30 ; Psychic Type Chance
+	db $10 ; Colorless Type Chance
+	db $10 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackLaboratoryTrainer:: ; 1e604 (7:6604)
+	db LABORATORY >> 4 ; booster pack set
+	dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+	db $10 ; Grass Type Chance
+	db $10 ; Fire Type Chance
+	db $10 ; Water Type Chance
+	db $10 ; Lightning Type Chance
+	db $10 ; Fighting Type Chance
+	db $10 ; Psychic Type Chance
+	db $10 ; Colorless Type Chance
+	db $30 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackEnergyLightningFire:: ; 1e610 (7:6610)
+	db COLOSSEUM >> 4 ; booster pack set
+	dw GenerateEnergyBoosterLightningFire ; energy or energy generation function
+
+; Card Type Chances
+	db $00 ; Grass Type Chance
+	db $00 ; Fire Type Chance
+	db $00 ; Water Type Chance
+	db $00 ; Lightning Type Chance
+	db $00 ; Fighting Type Chance
+	db $00 ; Psychic Type Chance
+	db $00 ; Colorless Type Chance
+	db $00 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackEnergyWaterFighting:: ; 1e61c (7:661c)
+	db COLOSSEUM >> 4 ; booster pack set
+	dw GenerateEnergyBoosterWaterFighting ; energy or energy generation function
+
+; Card Type Chances
+	db $00 ; Grass Type Chance
+	db $00 ; Fire Type Chance
+	db $00 ; Water Type Chance
+	db $00 ; Lightning Type Chance
+	db $00 ; Fighting Type Chance
+	db $00 ; Psychic Type Chance
+	db $00 ; Colorless Type Chance
+	db $00 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackEnergyGrassPsychic:: ; 1e628 (7:6628)
+	db COLOSSEUM >> 4 ; booster pack set
+	dw GenerateEnergyBoosterGrassPsychic ; energy or energy generation function
+
+; Card Type Chances
+	db $00 ; Grass Type Chance
+	db $00 ; Fire Type Chance
+	db $00 ; Water Type Chance
+	db $00 ; Lightning Type Chance
+	db $00 ; Fighting Type Chance
+	db $00 ; Psychic Type Chance
+	db $00 ; Colorless Type Chance
+	db $00 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
+
+PackRandomEnergies:: ; 1e634 (7:6634)
+	db COLOSSEUM >> 4 ; booster pack set
+	dw GenerateRandomEnergyBooster ; energy or energy generation function
+
+; Card Type Chances
+	db $00 ; Grass Type Chance
+	db $00 ; Fire Type Chance
+	db $00 ; Water Type Chance
+	db $00 ; Lightning Type Chance
+	db $00 ; Fighting Type Chance
+	db $00 ; Psychic Type Chance
+	db $00 ; Colorless Type Chance
+	db $00 ; Trainer Card Chance
+	db $00 ; Energy Card Chance
-- 
cgit v1.2.3


From 1e2c95d35bb4c6fc66182e873caf415862c7da08 Mon Sep 17 00:00:00 2001
From: xCrystal <rgr.crystal@gmail.com>
Date: Thu, 8 Feb 2018 13:16:13 +0100
Subject: Misc formatting and labeling

---
 src/data/npcs.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/data')

diff --git a/src/data/npcs.asm b/src/data/npcs.asm
index c6f4e4d..d7a3a61 100644
--- a/src/data/npcs.asm
+++ b/src/data/npcs.asm
@@ -1,5 +1,5 @@
 ; When you press the a button in front of something it will find a data entry somewhere on this list
-; it will then jump to the pointer in the data item. All jumps lead to an RST20 operation. 
+; it will then jump to the pointer in the data item. All jumps lead to an RST20 operation.
 PointerTable_118f5:
 	dw Data_119dd
 	dw Data_119dd
@@ -529,7 +529,7 @@ AmandaData:
 	dw OWSequence_Amanda ; Pointer to NPC Data
 	db $bd
 	db $03
-	db AMANDA_PIC
+	db AMANDA_PIC ; battle profile picture
 	db $23
 	db $03
 	db $15
-- 
cgit v1.2.3


From f541f5e03adadf0b9315cc642da9a5b377b52c12 Mon Sep 17 00:00:00 2001
From: xCrystal <rgr.crystal@gmail.com>
Date: Sat, 10 Feb 2018 14:11:36 +0100
Subject: Refractor/rearrange some macros

---
 src/data/cards.asm | 456 ++++++++++++++++++++++++++---------------------------
 1 file changed, 228 insertions(+), 228 deletions(-)

(limited to 'src/data')

diff --git a/src/data/cards.asm b/src/data/cards.asm
index 4b1a54b..b246f59 100755
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@@ -238,7 +238,7 @@ BulbasaurCard: ; 30e28 (c:4e28)
 	gfx BulbasaurCardGfx ; gfx
 	tx BulbasaurName ; name
 	db CIRCLE ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db BULBASAUR
 	db 40 ; hp
 	db BASIC ; stage
@@ -289,7 +289,7 @@ IvysaurCard: ; 30e69 (c:4e69)
 	gfx IvysaurCardGfx ; gfx
 	tx IvysaurName ; name
 	db DIAMOND ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db IVYSAUR
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -340,7 +340,7 @@ Venusaur1Card: ; 30eaa (c:4eaa)
 	gfx Venusaur1CardGfx ; gfx
 	tx VenusaurName ; name
 	db STAR ; rarity
-	db PROMOTIONAL | GB ; set
+	db PROMOTIONAL | GB ; sets
 	db VENUSAUR1
 	db 100 ; hp
 	db STAGE2 ; stage
@@ -391,7 +391,7 @@ Venusaur2Card: ; 30eeb (c:4eeb)
 	gfx Venusaur2CardGfx ; gfx
 	tx VenusaurName ; name
 	db STAR ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db VENUSAUR2
 	db 100 ; hp
 	db STAGE2 ; stage
@@ -442,7 +442,7 @@ CaterpieCard: ; 30f2c (c:4f2c)
 	gfx CaterpieCardGfx ; gfx
 	tx CaterpieName ; name
 	db CIRCLE ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db CATERPIE
 	db 40 ; hp
 	db BASIC ; stage
@@ -493,7 +493,7 @@ MetapodCard: ; 30f6d (c:4f6d)
 	gfx MetapodCardGfx ; gfx
 	tx MetapodName ; name
 	db CIRCLE ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db METAPOD
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -544,7 +544,7 @@ ButterfreeCard: ; 30fae (c:4fae)
 	gfx ButterfreeCardGfx ; gfx
 	tx ButterfreeName ; name
 	db DIAMOND ; rarity
-	db EVOLUTION | JUNGLE ; set
+	db EVOLUTION | JUNGLE ; sets
 	db BUTTERFREE
 	db 70 ; hp
 	db STAGE2 ; stage
@@ -595,7 +595,7 @@ WeedleCard: ; 30fef (c:4fef)
 	gfx WeedleCardGfx ; gfx
 	tx WeedleName ; name
 	db CIRCLE ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db WEEDLE
 	db 40 ; hp
 	db BASIC ; stage
@@ -646,7 +646,7 @@ KakunaCard: ; 31030 (c:5030)
 	gfx KakunaCardGfx ; gfx
 	tx KakunaName ; name
 	db DIAMOND ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db KAKUNA
 	db 80 ; hp
 	db STAGE1 ; stage
@@ -697,7 +697,7 @@ BeedrillCard: ; 31071 (c:5071)
 	gfx BeedrillCardGfx ; gfx
 	tx BeedrillName ; name
 	db STAR ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db BEEDRILL
 	db 80 ; hp
 	db STAGE2 ; stage
@@ -748,7 +748,7 @@ EkansCard: ; 310b2 (c:50b2)
 	gfx EkansCardGfx ; gfx
 	tx EkansName ; name
 	db CIRCLE ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db EKANS
 	db 40 ; hp
 	db BASIC ; stage
@@ -799,7 +799,7 @@ ArbokCard: ; 310f3 (c:50f3)
 	gfx ArbokCardGfx ; gfx
 	tx ArbokName ; name
 	db DIAMOND ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db ARBOK
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -850,7 +850,7 @@ NidoranFCard: ; 31134 (c:5134)
 	gfx NidoranFCardGfx ; gfx
 	tx NidoranFName ; name
 	db CIRCLE ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db NIDORANF
 	db 60 ; hp
 	db BASIC ; stage
@@ -901,7 +901,7 @@ NidorinaCard: ; 31175 (c:5175)
 	gfx NidorinaCardGfx ; gfx
 	tx NidorinaName ; name
 	db DIAMOND ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db NIDORINA
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -952,7 +952,7 @@ NidoqueenCard: ; 311b6 (c:51b6)
 	gfx NidoqueenCardGfx ; gfx
 	tx NidoqueenName ; name
 	db STAR ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db NIDOQUEEN
 	db 90 ; hp
 	db STAGE2 ; stage
@@ -1003,7 +1003,7 @@ NidoranMCard: ; 311f7 (c:51f7)
 	gfx NidoranMCardGfx ; gfx
 	tx NidoranMName ; name
 	db CIRCLE ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db NIDORANM
 	db 40 ; hp
 	db BASIC ; stage
@@ -1054,7 +1054,7 @@ NidorinoCard: ; 31238 (c:5238)
 	gfx NidorinoCardGfx ; gfx
 	tx NidorinoName ; name
 	db DIAMOND ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db NIDORINO
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -1105,7 +1105,7 @@ NidokingCard: ; 31279 (c:5279)
 	gfx NidokingCardGfx ; gfx
 	tx NidokingName ; name
 	db STAR ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db NIDOKING
 	db 90 ; hp
 	db STAGE2 ; stage
@@ -1156,7 +1156,7 @@ ZubatCard: ; 312ba (c:52ba)
 	gfx ZubatCardGfx ; gfx
 	tx ZubatName ; name
 	db CIRCLE ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db ZUBAT
 	db 40 ; hp
 	db BASIC ; stage
@@ -1207,7 +1207,7 @@ GolbatCard: ; 312fb (c:52fb)
 	gfx GolbatCardGfx ; gfx
 	tx GolbatName ; name
 	db DIAMOND ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db GOLBAT
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -1258,7 +1258,7 @@ OddishCard: ; 3133c (c:533c)
 	gfx OddishCardGfx ; gfx
 	tx OddishName ; name
 	db CIRCLE ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db ODDISH
 	db 50 ; hp
 	db BASIC ; stage
@@ -1309,7 +1309,7 @@ GloomCard: ; 3137d (c:537d)
 	gfx GloomCardGfx ; gfx
 	tx GloomName ; name
 	db DIAMOND ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db GLOOM
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -1360,7 +1360,7 @@ VileplumeCard: ; 313be (c:53be)
 	gfx VileplumeCardGfx ; gfx
 	tx VileplumeName ; name
 	db STAR ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db VILEPLUME
 	db 80 ; hp
 	db STAGE2 ; stage
@@ -1411,7 +1411,7 @@ ParasCard: ; 313ff (c:53ff)
 	gfx ParasCardGfx ; gfx
 	tx ParasName ; name
 	db CIRCLE ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db PARAS
 	db 40 ; hp
 	db BASIC ; stage
@@ -1462,7 +1462,7 @@ ParasectCard: ; 31440 (c:5440)
 	gfx ParasectCardGfx ; gfx
 	tx ParasectName ; name
 	db DIAMOND ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db PARASECT
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -1513,7 +1513,7 @@ VenonatCard: ; 31481 (c:5481)
 	gfx VenonatCardGfx ; gfx
 	tx VenonatName ; name
 	db CIRCLE ; rarity
-	db LABORATORY | JUNGLE ; set
+	db LABORATORY | JUNGLE ; sets
 	db VENONAT
 	db 40 ; hp
 	db BASIC ; stage
@@ -1564,7 +1564,7 @@ VenomothCard: ; 314c2 (c:54c2)
 	gfx VenomothCardGfx ; gfx
 	tx VenomothName ; name
 	db STAR ; rarity
-	db LABORATORY | JUNGLE ; set
+	db LABORATORY | JUNGLE ; sets
 	db VENOMOTH
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -1615,7 +1615,7 @@ BellsproutCard: ; 31503 (c:5503)
 	gfx BellsproutCardGfx ; gfx
 	tx BellsproutName ; name
 	db CIRCLE ; rarity
-	db EVOLUTION | JUNGLE ; set
+	db EVOLUTION | JUNGLE ; sets
 	db BELLSPROUT
 	db 40 ; hp
 	db BASIC ; stage
@@ -1666,7 +1666,7 @@ WeepinbellCard: ; 31544 (c:5544)
 	gfx WeepinbellCardGfx ; gfx
 	tx WeepinbellName ; name
 	db DIAMOND ; rarity
-	db EVOLUTION | JUNGLE ; set
+	db EVOLUTION | JUNGLE ; sets
 	db WEEPINBELL
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -1717,7 +1717,7 @@ VictreebelCard: ; 31585 (c:5585)
 	gfx VictreebelCardGfx ; gfx
 	tx VictreebelName ; name
 	db STAR ; rarity
-	db EVOLUTION | JUNGLE ; set
+	db EVOLUTION | JUNGLE ; sets
 	db VICTREEBEL
 	db 80 ; hp
 	db STAGE2 ; stage
@@ -1768,7 +1768,7 @@ GrimerCard: ; 315c6 (c:55c6)
 	gfx GrimerCardGfx ; gfx
 	tx GrimerName ; name
 	db CIRCLE ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db GRIMER
 	db 50 ; hp
 	db BASIC ; stage
@@ -1819,7 +1819,7 @@ MukCard: ; 31607 (c:5607)
 	gfx MukCardGfx ; gfx
 	tx MukName ; name
 	db STAR ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db MUK
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -1870,7 +1870,7 @@ ExeggcuteCard: ; 31648 (c:5648)
 	gfx ExeggcuteCardGfx ; gfx
 	tx ExeggcuteName ; name
 	db CIRCLE ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db EXEGGCUTE
 	db 50 ; hp
 	db BASIC ; stage
@@ -1921,7 +1921,7 @@ ExeggutorCard: ; 31689 (c:5689)
 	gfx ExeggutorCardGfx ; gfx
 	tx ExeggutorName ; name
 	db DIAMOND ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db EXEGGUTOR
 	db 80 ; hp
 	db STAGE1 ; stage
@@ -1972,7 +1972,7 @@ KoffingCard: ; 316ca (c:56ca)
 	gfx KoffingCardGfx ; gfx
 	tx KoffingName ; name
 	db CIRCLE ; rarity
-	db LABORATORY | NONE ; set
+	db LABORATORY | NONE ; sets
 	db KOFFING
 	db 50 ; hp
 	db BASIC ; stage
@@ -2023,7 +2023,7 @@ WeezingCard: ; 3170b (c:570b)
 	gfx WeezingCardGfx ; gfx
 	tx WeezingName ; name
 	db DIAMOND ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db WEEZING
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -2074,7 +2074,7 @@ Tangela1Card: ; 3174c (c:574c)
 	gfx Tangela1CardGfx ; gfx
 	tx TangelaName ; name
 	db CIRCLE ; rarity
-	db LABORATORY | NONE ; set
+	db LABORATORY | NONE ; sets
 	db TANGELA1
 	db 50 ; hp
 	db BASIC ; stage
@@ -2125,7 +2125,7 @@ Tangela2Card: ; 3178d (c:578d)
 	gfx Tangela2CardGfx ; gfx
 	tx TangelaName ; name
 	db CIRCLE ; rarity
-	db COLOSSEUM | GB ; set
+	db COLOSSEUM | GB ; sets
 	db TANGELA2
 	db 50 ; hp
 	db BASIC ; stage
@@ -2176,7 +2176,7 @@ ScytherCard: ; 317ce (c:57ce)
 	gfx ScytherCardGfx ; gfx
 	tx ScytherName ; name
 	db STAR ; rarity
-	db COLOSSEUM | JUNGLE ; set
+	db COLOSSEUM | JUNGLE ; sets
 	db SCYTHER
 	db 70 ; hp
 	db BASIC ; stage
@@ -2227,7 +2227,7 @@ PinsirCard: ; 3180f (c:580f)
 	gfx PinsirCardGfx ; gfx
 	tx PinsirName ; name
 	db STAR ; rarity
-	db COLOSSEUM | JUNGLE ; set
+	db COLOSSEUM | JUNGLE ; sets
 	db PINSIR
 	db 60 ; hp
 	db BASIC ; stage
@@ -2278,7 +2278,7 @@ CharmanderCard: ; 31850 (c:5850)
 	gfx CharmanderCardGfx ; gfx
 	tx CharmanderName ; name
 	db CIRCLE ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db CHARMANDER
 	db 50 ; hp
 	db BASIC ; stage
@@ -2329,7 +2329,7 @@ CharmeleonCard: ; 31891 (c:5891)
 	gfx CharmeleonCardGfx ; gfx
 	tx CharmeleonName ; name
 	db DIAMOND ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db CHARMELEON
 	db 80 ; hp
 	db STAGE1 ; stage
@@ -2380,7 +2380,7 @@ CharizardCard: ; 318d2 (c:58d2)
 	gfx CharizardCardGfx ; gfx
 	tx CharizardName ; name
 	db STAR ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db CHARIZARD
 	db 120 ; hp
 	db STAGE2 ; stage
@@ -2431,7 +2431,7 @@ VulpixCard: ; 31913 (c:5913)
 	gfx VulpixCardGfx ; gfx
 	tx VulpixName ; name
 	db CIRCLE ; rarity
-	db MYSTERY | NONE ; set
+	db MYSTERY | NONE ; sets
 	db VULPIX
 	db 50 ; hp
 	db BASIC ; stage
@@ -2482,7 +2482,7 @@ Ninetails1Card: ; 31954 (c:5954)
 	gfx Ninetails1CardGfx ; gfx
 	tx NinetailsName ; name
 	db STAR ; rarity
-	db MYSTERY | NONE ; set
+	db MYSTERY | NONE ; sets
 	db NINETAILS1
 	db 80 ; hp
 	db STAGE1 ; stage
@@ -2533,7 +2533,7 @@ Ninetails2Card: ; 31995 (c:5995)
 	gfx Ninetails2CardGfx ; gfx
 	tx NinetailsName ; name
 	db STAR ; rarity
-	db LABORATORY | GB ; set
+	db LABORATORY | GB ; sets
 	db NINETAILS2
 	db 80 ; hp
 	db STAGE1 ; stage
@@ -2584,7 +2584,7 @@ GrowlitheCard: ; 319d6 (c:59d6)
 	gfx GrowlitheCardGfx ; gfx
 	tx GrowlitheName ; name
 	db DIAMOND ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db GROWLITHE
 	db 60 ; hp
 	db BASIC ; stage
@@ -2635,7 +2635,7 @@ Arcanine1Card: ; 31a17 (c:5a17)
 	gfx Arcanine1CardGfx ; gfx
 	tx ArcanineName ; name
 	db PROMOSTAR ; rarity
-	db PROMOTIONAL | PRO ; set
+	db PROMOTIONAL | PRO ; sets
 	db ARCANINE1
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -2686,7 +2686,7 @@ Arcanine2Card: ; 31a58 (c:5a58)
 	gfx Arcanine2CardGfx ; gfx
 	tx ArcanineName ; name
 	db DIAMOND ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db ARCANINE2
 	db 100 ; hp
 	db STAGE1 ; stage
@@ -2737,7 +2737,7 @@ PonytaCard: ; 31a99 (c:5a99)
 	gfx PonytaCardGfx ; gfx
 	tx PonytaName ; name
 	db CIRCLE ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db PONYTA
 	db 40 ; hp
 	db BASIC ; stage
@@ -2788,7 +2788,7 @@ RapidashCard: ; 31ada (c:5ada)
 	gfx RapidashCardGfx ; gfx
 	tx RapidashName ; name
 	db DIAMOND ; rarity
-	db EVOLUTION | JUNGLE ; set
+	db EVOLUTION | JUNGLE ; sets
 	db RAPIDASH
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -2839,7 +2839,7 @@ Magmar1Card: ; 31b1b (c:5b1b)
 	gfx Magmar1CardGfx ; gfx
 	tx MagmarName ; name
 	db DIAMOND ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db MAGMAR1
 	db 50 ; hp
 	db BASIC ; stage
@@ -2890,7 +2890,7 @@ Magmar2Card: ; 31b5c (c:5b5c)
 	gfx Magmar2CardGfx ; gfx
 	tx MagmarName ; name
 	db DIAMOND ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db MAGMAR2
 	db 70 ; hp
 	db BASIC ; stage
@@ -2941,7 +2941,7 @@ Flareon1Card: ; 31b9d (c:5b9d)
 	gfx Flareon1CardGfx ; gfx
 	tx FlareonName ; name
 	db DIAMOND ; rarity
-	db MYSTERY | GB ; set
+	db MYSTERY | GB ; sets
 	db FLAREON1
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -2992,7 +2992,7 @@ Flareon2Card: ; 31bde (c:5bde)
 	gfx Flareon2CardGfx ; gfx
 	tx FlareonName ; name
 	db STAR ; rarity
-	db EVOLUTION | JUNGLE ; set
+	db EVOLUTION | JUNGLE ; sets
 	db FLAREON2
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -3043,7 +3043,7 @@ Moltres1Card: ; 31c1f (c:5c1f)
 	gfx Moltres1CardGfx ; gfx
 	tx MoltresName ; name
 	db STAR ; rarity
-	db MYSTERY | FOSSIL ; set
+	db MYSTERY | FOSSIL ; sets
 	db MOLTRES1
 	db 70 ; hp
 	db BASIC ; stage
@@ -3094,7 +3094,7 @@ Moltres2Card: ; 31c60 (c:5c60)
 	gfx Moltres2CardGfx ; gfx
 	tx MoltresName ; name
 	db STAR ; rarity
-	db PROMOTIONAL | GB ; set
+	db PROMOTIONAL | GB ; sets
 	db MOLTRES2
 	db 100 ; hp
 	db BASIC ; stage
@@ -3145,7 +3145,7 @@ SquirtleCard: ; 31ca1 (c:5ca1)
 	gfx SquirtleCardGfx ; gfx
 	tx SquirtleName ; name
 	db CIRCLE ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db SQUIRTLE
 	db 40 ; hp
 	db BASIC ; stage
@@ -3196,7 +3196,7 @@ WartortleCard: ; 31ce2 (c:5ce2)
 	gfx WartortleCardGfx ; gfx
 	tx WartortleName ; name
 	db DIAMOND ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db WARTORTLE
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -3247,7 +3247,7 @@ BlastoiseCard: ; 31d23 (c:5d23)
 	gfx BlastoiseCardGfx ; gfx
 	tx BlastoiseName ; name
 	db STAR ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db BLASTOISE
 	db 100 ; hp
 	db STAGE2 ; stage
@@ -3298,7 +3298,7 @@ PsyduckCard: ; 31d64 (c:5d64)
 	gfx PsyduckCardGfx ; gfx
 	tx PsyduckName ; name
 	db CIRCLE ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db PSYDUCK
 	db 50 ; hp
 	db BASIC ; stage
@@ -3349,7 +3349,7 @@ GolduckCard: ; 31da5 (c:5da5)
 	gfx GolduckCardGfx ; gfx
 	tx GolduckName ; name
 	db DIAMOND ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db GOLDUCK
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -3400,7 +3400,7 @@ PoliwagCard: ; 31de6 (c:5de6)
 	gfx PoliwagCardGfx ; gfx
 	tx PoliwagName ; name
 	db CIRCLE ; rarity
-	db LABORATORY | NONE ; set
+	db LABORATORY | NONE ; sets
 	db POLIWAG
 	db 40 ; hp
 	db BASIC ; stage
@@ -3451,7 +3451,7 @@ PoliwhirlCard: ; 31e27 (c:5e27)
 	gfx PoliwhirlCardGfx ; gfx
 	tx PoliwhirlName ; name
 	db DIAMOND ; rarity
-	db LABORATORY | NONE ; set
+	db LABORATORY | NONE ; sets
 	db POLIWHIRL
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -3502,7 +3502,7 @@ PoliwrathCard: ; 31e68 (c:5e68)
 	gfx PoliwrathCardGfx ; gfx
 	tx PoliwrathName ; name
 	db STAR ; rarity
-	db LABORATORY | NONE ; set
+	db LABORATORY | NONE ; sets
 	db POLIWRATH
 	db 90 ; hp
 	db STAGE2 ; stage
@@ -3553,7 +3553,7 @@ TentacoolCard: ; 31ea9 (c:5ea9)
 	gfx TentacoolCardGfx ; gfx
 	tx TentacoolName ; name
 	db CIRCLE ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db TENTACOOL
 	db 30 ; hp
 	db BASIC ; stage
@@ -3604,7 +3604,7 @@ TentacruelCard: ; 31eea (c:5eea)
 	gfx TentacruelCardGfx ; gfx
 	tx TentacruelName ; name
 	db DIAMOND ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db TENTACRUEL
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -3655,7 +3655,7 @@ SeelCard: ; 31f2b (c:5f2b)
 	gfx SeelCardGfx ; gfx
 	tx SeelName ; name
 	db DIAMOND ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db SEEL
 	db 60 ; hp
 	db BASIC ; stage
@@ -3706,7 +3706,7 @@ DewgongCard: ; 31f6c (c:5f6c)
 	gfx DewgongCardGfx ; gfx
 	tx DewgongName ; name
 	db DIAMOND ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db DEWGONG
 	db 80 ; hp
 	db STAGE1 ; stage
@@ -3757,7 +3757,7 @@ ShellderCard: ; 31fad (c:5fad)
 	gfx ShellderCardGfx ; gfx
 	tx ShellderName ; name
 	db CIRCLE ; rarity
-	db MYSTERY | FOSSIL ; set
+	db MYSTERY | FOSSIL ; sets
 	db SHELLDER
 	db 30 ; hp
 	db BASIC ; stage
@@ -3808,7 +3808,7 @@ CloysterCard: ; 31fee (c:5fee)
 	gfx CloysterCardGfx ; gfx
 	tx CloysterName ; name
 	db DIAMOND ; rarity
-	db MYSTERY | FOSSIL ; set
+	db MYSTERY | FOSSIL ; sets
 	db CLOYSTER
 	db 50 ; hp
 	db STAGE1 ; stage
@@ -3859,7 +3859,7 @@ KrabbyCard: ; 3202f (c:602f)
 	gfx KrabbyCardGfx ; gfx
 	tx KrabbyName ; name
 	db CIRCLE ; rarity
-	db EVOLUTION | FOSSIL ; set
+	db EVOLUTION | FOSSIL ; sets
 	db KRABBY
 	db 50 ; hp
 	db BASIC ; stage
@@ -3910,7 +3910,7 @@ KinglerCard: ; 32070 (c:6070)
 	gfx KinglerCardGfx ; gfx
 	tx KinglerName ; name
 	db DIAMOND ; rarity
-	db EVOLUTION | FOSSIL ; set
+	db EVOLUTION | FOSSIL ; sets
 	db KINGLER
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -3961,7 +3961,7 @@ HorseaCard: ; 320b1 (c:60b1)
 	gfx HorseaCardGfx ; gfx
 	tx HorseaName ; name
 	db CIRCLE ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db HORSEA
 	db 40 ; hp
 	db BASIC ; stage
@@ -4012,7 +4012,7 @@ SeadraCard: ; 320f2 (c:60f2)
 	gfx SeadraCardGfx ; gfx
 	tx SeadraName ; name
 	db DIAMOND ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db SEADRA
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -4063,7 +4063,7 @@ GoldeenCard: ; 32133 (c:6133)
 	gfx GoldeenCardGfx ; gfx
 	tx GoldeenName ; name
 	db CIRCLE ; rarity
-	db COLOSSEUM | JUNGLE ; set
+	db COLOSSEUM | JUNGLE ; sets
 	db GOLDEEN
 	db 40 ; hp
 	db BASIC ; stage
@@ -4114,7 +4114,7 @@ SeakingCard: ; 32174 (c:6174)
 	gfx SeakingCardGfx ; gfx
 	tx SeakingName ; name
 	db DIAMOND ; rarity
-	db COLOSSEUM | JUNGLE ; set
+	db COLOSSEUM | JUNGLE ; sets
 	db SEAKING
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -4165,7 +4165,7 @@ StaryuCard: ; 321b5 (c:61b5)
 	gfx StaryuCardGfx ; gfx
 	tx StaryuName ; name
 	db CIRCLE ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db STARYU
 	db 40 ; hp
 	db BASIC ; stage
@@ -4216,7 +4216,7 @@ StarmieCard: ; 321f6 (c:61f6)
 	gfx StarmieCardGfx ; gfx
 	tx StarmieName ; name
 	db CIRCLE ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db STARMIE
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -4267,7 +4267,7 @@ MagikarpCard: ; 32237 (c:6237)
 	gfx MagikarpCardGfx ; gfx
 	tx MagikarpName ; name
 	db DIAMOND ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db MAGIKARP
 	db 30 ; hp
 	db BASIC ; stage
@@ -4318,7 +4318,7 @@ GyaradosCard: ; 32278 (c:6278)
 	gfx GyaradosCardGfx ; gfx
 	tx GyaradosName ; name
 	db STAR ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db GYARADOS
 	db 100 ; hp
 	db STAGE1 ; stage
@@ -4369,7 +4369,7 @@ LaprasCard: ; 322b9 (c:62b9)
 	gfx LaprasCardGfx ; gfx
 	tx LaprasName ; name
 	db STAR ; rarity
-	db MYSTERY | FOSSIL ; set
+	db MYSTERY | FOSSIL ; sets
 	db LAPRAS
 	db 80 ; hp
 	db BASIC ; stage
@@ -4420,7 +4420,7 @@ Vaporeon1Card: ; 322fa (c:62fa)
 	gfx Vaporeon1CardGfx ; gfx
 	tx VaporeonName ; name
 	db DIAMOND ; rarity
-	db MYSTERY | GB ; set
+	db MYSTERY | GB ; sets
 	db VAPOREON1
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -4471,7 +4471,7 @@ Vaporeon2Card: ; 3233b (c:633b)
 	gfx Vaporeon2CardGfx ; gfx
 	tx VaporeonName ; name
 	db STAR ; rarity
-	db EVOLUTION | JUNGLE ; set
+	db EVOLUTION | JUNGLE ; sets
 	db VAPOREON2
 	db 80 ; hp
 	db STAGE1 ; stage
@@ -4522,7 +4522,7 @@ OmanyteCard: ; 3237c (c:637c)
 	gfx OmanyteCardGfx ; gfx
 	tx OmanyteName ; name
 	db CIRCLE ; rarity
-	db MYSTERY | FOSSIL ; set
+	db MYSTERY | FOSSIL ; sets
 	db OMANYTE
 	db 40 ; hp
 	db STAGE1 ; stage
@@ -4573,7 +4573,7 @@ OmastarCard: ; 323bd (c:63bd)
 	gfx OmastarCardGfx ; gfx
 	tx OmastarName ; name
 	db DIAMOND ; rarity
-	db MYSTERY | FOSSIL ; set
+	db MYSTERY | FOSSIL ; sets
 	db OMASTAR
 	db 70 ; hp
 	db STAGE2 ; stage
@@ -4624,7 +4624,7 @@ Articuno1Card: ; 323fe (c:63fe)
 	gfx Articuno1CardGfx ; gfx
 	tx ArticunoName ; name
 	db STAR ; rarity
-	db MYSTERY | FOSSIL ; set
+	db MYSTERY | FOSSIL ; sets
 	db ARTICUNO1
 	db 70 ; hp
 	db BASIC ; stage
@@ -4675,7 +4675,7 @@ Articuno2Card: ; 3243f (c:643f)
 	gfx Articuno2CardGfx ; gfx
 	tx ArticunoName ; name
 	db STAR ; rarity
-	db PROMOTIONAL | GB ; set
+	db PROMOTIONAL | GB ; sets
 	db ARTICUNO2
 	db 100 ; hp
 	db BASIC ; stage
@@ -4726,7 +4726,7 @@ Pikachu1Card: ; 32480 (c:6480)
 	gfx Pikachu1CardGfx ; gfx
 	tx PikachuName ; name
 	db CIRCLE ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db PIKACHU1
 	db 40 ; hp
 	db BASIC ; stage
@@ -4777,7 +4777,7 @@ Pikachu2Card: ; 324c1 (c:64c1)
 	gfx Pikachu2CardGfx ; gfx
 	tx PikachuName ; name
 	db CIRCLE ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db PIKACHU2
 	db 50 ; hp
 	db BASIC ; stage
@@ -4828,7 +4828,7 @@ Pikachu3Card: ; 32502 (c:6502)
 	gfx Pikachu3CardGfx ; gfx
 	tx PikachuName ; name
 	db PROMOSTAR ; rarity
-	db PROMOTIONAL | PRO ; set
+	db PROMOTIONAL | PRO ; sets
 	db PIKACHU3
 	db 60 ; hp
 	db BASIC ; stage
@@ -4879,7 +4879,7 @@ Pikachu4Card: ; 32543 (c:6543)
 	gfx Pikachu4CardGfx ; gfx
 	tx PikachuName ; name
 	db PROMOSTAR ; rarity
-	db PROMOTIONAL | PRO ; set
+	db PROMOTIONAL | PRO ; sets
 	db PIKACHU4
 	db 60 ; hp
 	db BASIC ; stage
@@ -4930,7 +4930,7 @@ FlyingPikachuCard: ; 32584 (c:6584)
 	gfx FlyingPikachuCardGfx ; gfx
 	tx FlyingPikachuName ; name
 	db PROMOSTAR ; rarity
-	db PROMOTIONAL | PRO ; set
+	db PROMOTIONAL | PRO ; sets
 	db FLYING_PIKACHU
 	db 40 ; hp
 	db BASIC ; stage
@@ -4981,7 +4981,7 @@ SurfingPikachu1Card: ; 325c5 (c:65c5)
 	gfx SurfingPikachu1CardGfx ; gfx
 	tx SurfingPikachuName ; name
 	db PROMOSTAR ; rarity
-	db PROMOTIONAL | PRO ; set
+	db PROMOTIONAL | PRO ; sets
 	db SURFING_PIKACHU1
 	db 50 ; hp
 	db BASIC ; stage
@@ -5032,7 +5032,7 @@ SurfingPikachu2Card: ; 32606 (c:6606)
 	gfx SurfingPikachu2CardGfx ; gfx
 	tx SurfingPikachuName ; name
 	db PROMOSTAR ; rarity
-	db PROMOTIONAL | PRO ; set
+	db PROMOTIONAL | PRO ; sets
 	db SURFING_PIKACHU2
 	db 50 ; hp
 	db BASIC ; stage
@@ -5083,7 +5083,7 @@ Raichu1Card: ; 32647 (c:6647)
 	gfx Raichu1CardGfx ; gfx
 	tx RaichuName ; name
 	db STAR ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db RAICHU1
 	db 80 ; hp
 	db STAGE1 ; stage
@@ -5134,7 +5134,7 @@ Raichu2Card: ; 32688 (c:6688)
 	gfx Raichu2CardGfx ; gfx
 	tx RaichuName ; name
 	db STAR ; rarity
-	db MYSTERY | FOSSIL ; set
+	db MYSTERY | FOSSIL ; sets
 	db RAICHU2
 	db 90 ; hp
 	db STAGE1 ; stage
@@ -5185,7 +5185,7 @@ Magnemite1Card: ; 326c9 (c:66c9)
 	gfx Magnemite1CardGfx ; gfx
 	tx MagnemiteName ; name
 	db CIRCLE ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db MAGNEMITE1
 	db 40 ; hp
 	db BASIC ; stage
@@ -5236,7 +5236,7 @@ Magnemite2Card: ; 3270a (c:670a)
 	gfx Magnemite2CardGfx ; gfx
 	tx MagnemiteName ; name
 	db CIRCLE ; rarity
-	db LABORATORY | GB ; set
+	db LABORATORY | GB ; sets
 	db MAGNEMITE2
 	db 40 ; hp
 	db BASIC ; stage
@@ -5287,7 +5287,7 @@ Magneton1Card: ; 3274b (c:674b)
 	gfx Magneton1CardGfx ; gfx
 	tx MagnetonName ; name
 	db STAR ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db MAGNETON1
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -5338,7 +5338,7 @@ Magneton2Card: ; 3278c (c:678c)
 	gfx Magneton2CardGfx ; gfx
 	tx MagnetonName ; name
 	db STAR ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db MAGNETON2
 	db 80 ; hp
 	db STAGE1 ; stage
@@ -5389,7 +5389,7 @@ VoltorbCard: ; 327cd (c:67cd)
 	gfx VoltorbCardGfx ; gfx
 	tx VoltorbName ; name
 	db CIRCLE ; rarity
-	db MYSTERY | NONE ; set
+	db MYSTERY | NONE ; sets
 	db VOLTORB
 	db 40 ; hp
 	db BASIC ; stage
@@ -5440,7 +5440,7 @@ Electrode1Card: ; 3280e (c:680e)
 	gfx Electrode1CardGfx ; gfx
 	tx ElectrodeName ; name
 	db STAR ; rarity
-	db LABORATORY | GB ; set
+	db LABORATORY | GB ; sets
 	db ELECTRODE1
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -5491,7 +5491,7 @@ Electrode2Card: ; 3284f (c:684f)
 	gfx Electrode2CardGfx ; gfx
 	tx ElectrodeName ; name
 	db STAR ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db ELECTRODE2
 	db 90 ; hp
 	db STAGE1 ; stage
@@ -5542,7 +5542,7 @@ Electabuzz1Card: ; 32890 (c:6890)
 	gfx Electabuzz1CardGfx ; gfx
 	tx ElectabuzzName ; name
 	db PROMOSTAR ; rarity
-	db PROMOTIONAL | PRO ; set
+	db PROMOTIONAL | PRO ; sets
 	db ELECTABUZZ1
 	db 60 ; hp
 	db BASIC ; stage
@@ -5593,7 +5593,7 @@ Electabuzz2Card: ; 328d1 (c:68d1)
 	gfx Electabuzz2CardGfx ; gfx
 	tx ElectabuzzName ; name
 	db STAR ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db ELECTABUZZ2
 	db 70 ; hp
 	db BASIC ; stage
@@ -5644,7 +5644,7 @@ Jolteon1Card: ; 32912 (c:6912)
 	gfx Jolteon1CardGfx ; gfx
 	tx JolteonName ; name
 	db DIAMOND ; rarity
-	db MYSTERY | GB ; set
+	db MYSTERY | GB ; sets
 	db JOLTEON1
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -5695,7 +5695,7 @@ Jolteon2Card: ; 32953 (c:6953)
 	gfx Jolteon2CardGfx ; gfx
 	tx JolteonName ; name
 	db STAR ; rarity
-	db EVOLUTION | JUNGLE ; set
+	db EVOLUTION | JUNGLE ; sets
 	db JOLTEON2
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -5746,7 +5746,7 @@ Zapdos1Card: ; 32994 (c:6994)
 	gfx Zapdos1CardGfx ; gfx
 	tx ZapdosName ; name
 	db STAR ; rarity
-	db MYSTERY | FOSSIL ; set
+	db MYSTERY | FOSSIL ; sets
 	db ZAPDOS1
 	db 80 ; hp
 	db BASIC ; stage
@@ -5797,7 +5797,7 @@ Zapdos2Card: ; 329d5 (c:69d5)
 	gfx Zapdos2CardGfx ; gfx
 	tx ZapdosName ; name
 	db STAR ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db ZAPDOS2
 	db 90 ; hp
 	db BASIC ; stage
@@ -5848,7 +5848,7 @@ Zapdos3Card: ; 32a16 (c:6a16)
 	gfx Zapdos3CardGfx ; gfx
 	tx ZapdosName ; name
 	db STAR ; rarity
-	db PROMOTIONAL | GB ; set
+	db PROMOTIONAL | GB ; sets
 	db ZAPDOS3
 	db 100 ; hp
 	db BASIC ; stage
@@ -5899,7 +5899,7 @@ SandshrewCard: ; 32a57 (c:6a57)
 	gfx SandshrewCardGfx ; gfx
 	tx SandshrewName ; name
 	db CIRCLE ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db SANDSHREW
 	db 40 ; hp
 	db BASIC ; stage
@@ -5950,7 +5950,7 @@ SandslashCard: ; 32a98 (c:6a98)
 	gfx SandslashCardGfx ; gfx
 	tx SandslashName ; name
 	db DIAMOND ; rarity
-	db EVOLUTION | FOSSIL ; set
+	db EVOLUTION | FOSSIL ; sets
 	db SANDSLASH
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -6001,7 +6001,7 @@ DiglettCard: ; 32ad9 (c:6ad9)
 	gfx DiglettCardGfx ; gfx
 	tx DiglettName ; name
 	db CIRCLE ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db DIGLETT
 	db 30 ; hp
 	db BASIC ; stage
@@ -6052,7 +6052,7 @@ DugtrioCard: ; 32b1a (c:6b1a)
 	gfx DugtrioCardGfx ; gfx
 	tx DugtrioName ; name
 	db STAR ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db DUGTRIO
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -6103,7 +6103,7 @@ MankeyCard: ; 32b5b (c:6b5b)
 	gfx MankeyCardGfx ; gfx
 	tx MankeyName ; name
 	db CIRCLE ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db MANKEY
 	db 30 ; hp
 	db BASIC ; stage
@@ -6154,7 +6154,7 @@ PrimeapeCard: ; 32b9c (c:6b9c)
 	gfx PrimeapeCardGfx ; gfx
 	tx PrimeapeName ; name
 	db DIAMOND ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db PRIMEAPE
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -6205,7 +6205,7 @@ MachopCard: ; 32bdd (c:6bdd)
 	gfx MachopCardGfx ; gfx
 	tx MachopName ; name
 	db CIRCLE ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db MACHOP
 	db 50 ; hp
 	db BASIC ; stage
@@ -6256,7 +6256,7 @@ MachokeCard: ; 32c1e (c:6c1e)
 	gfx MachokeCardGfx ; gfx
 	tx MachokeName ; name
 	db DIAMOND ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db MACHOKE
 	db 80 ; hp
 	db STAGE1 ; stage
@@ -6307,7 +6307,7 @@ MachampCard: ; 32c5f (c:6c5f)
 	gfx MachampCardGfx ; gfx
 	tx MachampName ; name
 	db STAR ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db MACHAMP
 	db 100 ; hp
 	db STAGE2 ; stage
@@ -6358,7 +6358,7 @@ GeodudeCard: ; 32ca0 (c:6ca0)
 	gfx GeodudeCardGfx ; gfx
 	tx GeodudeName ; name
 	db CIRCLE ; rarity
-	db EVOLUTION | FOSSIL ; set
+	db EVOLUTION | FOSSIL ; sets
 	db GEODUDE
 	db 50 ; hp
 	db BASIC ; stage
@@ -6409,7 +6409,7 @@ GravelerCard: ; 32ce1 (c:6ce1)
 	gfx GravelerCardGfx ; gfx
 	tx GravelerName ; name
 	db DIAMOND ; rarity
-	db EVOLUTION | FOSSIL ; set
+	db EVOLUTION | FOSSIL ; sets
 	db GRAVELER
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -6460,7 +6460,7 @@ GolemCard: ; 32d22 (c:6d22)
 	gfx GolemCardGfx ; gfx
 	tx GolemName ; name
 	db DIAMOND ; rarity
-	db EVOLUTION | FOSSIL ; set
+	db EVOLUTION | FOSSIL ; sets
 	db GOLEM
 	db 80 ; hp
 	db STAGE2 ; stage
@@ -6511,7 +6511,7 @@ OnixCard: ; 32d63 (c:6d63)
 	gfx OnixCardGfx ; gfx
 	tx OnixName ; name
 	db CIRCLE ; rarity
-	db LABORATORY | NONE ; set
+	db LABORATORY | NONE ; sets
 	db ONIX
 	db 90 ; hp
 	db BASIC ; stage
@@ -6562,7 +6562,7 @@ CuboneCard: ; 32da4 (c:6da4)
 	gfx CuboneCardGfx ; gfx
 	tx CuboneName ; name
 	db CIRCLE ; rarity
-	db EVOLUTION | JUNGLE ; set
+	db EVOLUTION | JUNGLE ; sets
 	db CUBONE
 	db 40 ; hp
 	db BASIC ; stage
@@ -6613,7 +6613,7 @@ Marowak1Card: ; 32de5 (c:6de5)
 	gfx Marowak1CardGfx ; gfx
 	tx MarowakName ; name
 	db DIAMOND ; rarity
-	db LABORATORY | JUNGLE ; set
+	db LABORATORY | JUNGLE ; sets
 	db MAROWAK1
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -6664,7 +6664,7 @@ Marowak2Card: ; 32e26 (c:6e26)
 	gfx Marowak2CardGfx ; gfx
 	tx MarowakName ; name
 	db DIAMOND ; rarity
-	db EVOLUTION | GB ; set
+	db EVOLUTION | GB ; sets
 	db MAROWAK2
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -6715,7 +6715,7 @@ HitmonleeCard: ; 32e67 (c:6e67)
 	gfx HitmonleeCardGfx ; gfx
 	tx HitmonleeName ; name
 	db STAR ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db HITMONLEE
 	db 60 ; hp
 	db BASIC ; stage
@@ -6766,7 +6766,7 @@ HitmonchanCard: ; 32ea8 (c:6ea8)
 	gfx HitmonchanCardGfx ; gfx
 	tx HitmonchanName ; name
 	db STAR ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db HITMONCHAN
 	db 70 ; hp
 	db BASIC ; stage
@@ -6817,7 +6817,7 @@ RhyhornCard: ; 32ee9 (c:6ee9)
 	gfx RhyhornCardGfx ; gfx
 	tx RhyhornName ; name
 	db CIRCLE ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db RHYHORN
 	db 70 ; hp
 	db BASIC ; stage
@@ -6868,7 +6868,7 @@ RhydonCard: ; 32f2a (c:6f2a)
 	gfx RhydonCardGfx ; gfx
 	tx RhydonName ; name
 	db DIAMOND ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db RHYDON
 	db 100 ; hp
 	db STAGE1 ; stage
@@ -6919,7 +6919,7 @@ KabutoCard: ; 32f6b (c:6f6b)
 	gfx KabutoCardGfx ; gfx
 	tx KabutoName ; name
 	db CIRCLE ; rarity
-	db MYSTERY | FOSSIL ; set
+	db MYSTERY | FOSSIL ; sets
 	db KABUTO
 	db 30 ; hp
 	db STAGE1 ; stage
@@ -6970,7 +6970,7 @@ KabutopsCard: ; 32fac (c:6fac)
 	gfx KabutopsCardGfx ; gfx
 	tx KabutopsName ; name
 	db STAR ; rarity
-	db MYSTERY | FOSSIL ; set
+	db MYSTERY | FOSSIL ; sets
 	db KABUTOPS
 	db 60 ; hp
 	db STAGE2 ; stage
@@ -7021,7 +7021,7 @@ AerodactylCard: ; 32fed (c:6fed)
 	gfx AerodactylCardGfx ; gfx
 	tx AerodactylName ; name
 	db STAR ; rarity
-	db MYSTERY | FOSSIL ; set
+	db MYSTERY | FOSSIL ; sets
 	db AERODACTYL
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -7072,7 +7072,7 @@ AbraCard: ; 3302e (c:702e)
 	gfx AbraCardGfx ; gfx
 	tx AbraName ; name
 	db CIRCLE ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db ABRA
 	db 30 ; hp
 	db BASIC ; stage
@@ -7123,7 +7123,7 @@ KadabraCard: ; 3306f (c:706f)
 	gfx KadabraCardGfx ; gfx
 	tx KadabraName ; name
 	db DIAMOND ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db KADABRA
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -7174,7 +7174,7 @@ AlakazamCard: ; 330b0 (c:70b0)
 	gfx AlakazamCardGfx ; gfx
 	tx AlakazamName ; name
 	db STAR ; rarity
-	db MYSTERY | NONE ; set
+	db MYSTERY | NONE ; sets
 	db ALAKAZAM
 	db 80 ; hp
 	db STAGE2 ; stage
@@ -7225,7 +7225,7 @@ Slowpoke1Card: ; 330f1 (c:70f1)
 	gfx Slowpoke1CardGfx ; gfx
 	tx SlowpokeName ; name
 	db PROMOSTAR ; rarity
-	db PROMOTIONAL | PRO ; set
+	db PROMOTIONAL | PRO ; sets
 	db SLOWPOKE1
 	db 40 ; hp
 	db BASIC ; stage
@@ -7276,7 +7276,7 @@ Slowpoke2Card: ; 33132 (c:7132)
 	gfx Slowpoke2CardGfx ; gfx
 	tx SlowpokeName ; name
 	db CIRCLE ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db SLOWPOKE2
 	db 50 ; hp
 	db BASIC ; stage
@@ -7327,7 +7327,7 @@ SlowbroCard: ; 33173 (c:7173)
 	gfx SlowbroCardGfx ; gfx
 	tx SlowbroName ; name
 	db DIAMOND ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db SLOWBRO
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -7378,7 +7378,7 @@ Gastly1Card: ; 331b4 (c:71b4)
 	gfx Gastly1CardGfx ; gfx
 	tx GastlyName ; name
 	db CIRCLE ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db GASTLY1
 	db 30 ; hp
 	db BASIC ; stage
@@ -7429,7 +7429,7 @@ Gastly2Card: ; 331f5 (c:71f5)
 	gfx Gastly2CardGfx ; gfx
 	tx GastlyName ; name
 	db DIAMOND ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db GASTLY2
 	db 50 ; hp
 	db BASIC ; stage
@@ -7480,7 +7480,7 @@ Haunter1Card: ; 33236 (c:7236)
 	gfx Haunter1CardGfx ; gfx
 	tx HaunterName ; name
 	db STAR ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db HAUNTER1
 	db 50 ; hp
 	db STAGE1 ; stage
@@ -7531,7 +7531,7 @@ Haunter2Card: ; 33277 (c:7277)
 	gfx Haunter2CardGfx ; gfx
 	tx HaunterName ; name
 	db DIAMOND ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db HAUNTER2
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -7582,7 +7582,7 @@ GengarCard: ; 332b8 (c:72b8)
 	gfx GengarCardGfx ; gfx
 	tx GengarName ; name
 	db STAR ; rarity
-	db EVOLUTION | FOSSIL ; set
+	db EVOLUTION | FOSSIL ; sets
 	db GENGAR
 	db 80 ; hp
 	db STAGE2 ; stage
@@ -7633,7 +7633,7 @@ DrowzeeCard: ; 332f9 (c:72f9)
 	gfx DrowzeeCardGfx ; gfx
 	tx DrowzeeName ; name
 	db CIRCLE ; rarity
-	db MYSTERY | NONE ; set
+	db MYSTERY | NONE ; sets
 	db DROWZEE
 	db 50 ; hp
 	db BASIC ; stage
@@ -7684,7 +7684,7 @@ HypnoCard: ; 3333a (c:733a)
 	gfx HypnoCardGfx ; gfx
 	tx HypnoName ; name
 	db STAR ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db HYPNO
 	db 90 ; hp
 	db STAGE1 ; stage
@@ -7735,7 +7735,7 @@ MrMimeCard: ; 3337b (c:737b)
 	gfx MrMimeCardGfx ; gfx
 	tx MrMimeName ; name
 	db STAR ; rarity
-	db LABORATORY | JUNGLE ; set
+	db LABORATORY | JUNGLE ; sets
 	db MR_MIME
 	db 40 ; hp
 	db BASIC ; stage
@@ -7786,7 +7786,7 @@ JynxCard: ; 333bc (c:73bc)
 	gfx JynxCardGfx ; gfx
 	tx JynxName ; name
 	db DIAMOND ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db JYNX
 	db 70 ; hp
 	db BASIC ; stage
@@ -7837,7 +7837,7 @@ Mewtwo1Card: ; 333fd (c:73fd)
 	gfx Mewtwo1CardGfx ; gfx
 	tx MewtwoName ; name
 	db STAR ; rarity
-	db LABORATORY | NONE ; set
+	db LABORATORY | NONE ; sets
 	db MEWTWO1
 	db 60 ; hp
 	db BASIC ; stage
@@ -7888,7 +7888,7 @@ Mewtwo2Card: ; 3343e (c:743e)
 	gfx Mewtwo2CardGfx ; gfx
 	tx MewtwoName ; name
 	db PROMOSTAR ; rarity
-	db PROMOTIONAL | PRO ; set
+	db PROMOTIONAL | PRO ; sets
 	db MEWTWO2
 	db 70 ; hp
 	db BASIC ; stage
@@ -7939,7 +7939,7 @@ Mewtwo3Card: ; 3347f (c:747f)
 	gfx Mewtwo3CardGfx ; gfx
 	tx MewtwoName ; name
 	db PROMOSTAR ; rarity
-	db PROMOTIONAL | PRO ; set
+	db PROMOTIONAL | PRO ; sets
 	db MEWTWO3
 	db 70 ; hp
 	db BASIC ; stage
@@ -7990,7 +7990,7 @@ Mew1Card: ; 334c0 (c:74c0)
 	gfx Mew1CardGfx ; gfx
 	tx MewName ; name
 	db PROMOSTAR ; rarity
-	db PROMOTIONAL | PRO ; set
+	db PROMOTIONAL | PRO ; sets
 	db MEW1
 	db 40 ; hp
 	db BASIC ; stage
@@ -8041,7 +8041,7 @@ Mew2Card: ; 33501 (c:7501)
 	gfx Mew2CardGfx ; gfx
 	tx MewName ; name
 	db STAR ; rarity
-	db PROMOTIONAL | GB ; set
+	db PROMOTIONAL | GB ; sets
 	db MEW2
 	db 50 ; hp
 	db BASIC ; stage
@@ -8092,7 +8092,7 @@ Mew3Card: ; 33542 (c:7542)
 	gfx Mew3CardGfx ; gfx
 	tx MewName ; name
 	db STAR ; rarity
-	db MYSTERY | FOSSIL ; set
+	db MYSTERY | FOSSIL ; sets
 	db MEW3
 	db 50 ; hp
 	db BASIC ; stage
@@ -8143,7 +8143,7 @@ PidgeyCard: ; 33583 (c:7583)
 	gfx PidgeyCardGfx ; gfx
 	tx PidgeyName ; name
 	db CIRCLE ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db PIDGEY
 	db 40 ; hp
 	db BASIC ; stage
@@ -8194,7 +8194,7 @@ PidgeottoCard: ; 335c4 (c:75c4)
 	gfx PidgeottoCardGfx ; gfx
 	tx PidgeottoName ; name
 	db STAR ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db PIDGEOTTO
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -8245,7 +8245,7 @@ Pidgeot1Card: ; 33605 (c:7605)
 	gfx Pidgeot1CardGfx ; gfx
 	tx PidgeotName ; name
 	db STAR ; rarity
-	db LABORATORY | GB ; set
+	db LABORATORY | GB ; sets
 	db PIDGEOT1
 	db 80 ; hp
 	db STAGE2 ; stage
@@ -8296,7 +8296,7 @@ Pidgeot2Card: ; 33646 (c:7646)
 	gfx Pidgeot2CardGfx ; gfx
 	tx PidgeotName ; name
 	db STAR ; rarity
-	db EVOLUTION | JUNGLE ; set
+	db EVOLUTION | JUNGLE ; sets
 	db PIDGEOT2
 	db 80 ; hp
 	db STAGE2 ; stage
@@ -8347,7 +8347,7 @@ RattataCard: ; 33687 (c:7687)
 	gfx RattataCardGfx ; gfx
 	tx RattataName ; name
 	db CIRCLE ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db RATTATA
 	db 30 ; hp
 	db BASIC ; stage
@@ -8398,7 +8398,7 @@ RaticateCard: ; 336c8 (c:76c8)
 	gfx RaticateCardGfx ; gfx
 	tx RaticateName ; name
 	db DIAMOND ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db RATICATE
 	db 60 ; hp
 	db STAGE1 ; stage
@@ -8449,7 +8449,7 @@ SpearowCard: ; 33709 (c:7709)
 	gfx SpearowCardGfx ; gfx
 	tx SpearowName ; name
 	db CIRCLE ; rarity
-	db LABORATORY | JUNGLE ; set
+	db LABORATORY | JUNGLE ; sets
 	db SPEAROW
 	db 50 ; hp
 	db BASIC ; stage
@@ -8500,7 +8500,7 @@ FearowCard: ; 3374a (c:774a)
 	gfx FearowCardGfx ; gfx
 	tx FearowName ; name
 	db DIAMOND ; rarity
-	db LABORATORY | JUNGLE ; set
+	db LABORATORY | JUNGLE ; sets
 	db FEAROW
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -8551,7 +8551,7 @@ ClefairyCard: ; 3378b (c:778b)
 	gfx ClefairyCardGfx ; gfx
 	tx ClefairyName ; name
 	db STAR ; rarity
-	db MYSTERY | NONE ; set
+	db MYSTERY | NONE ; sets
 	db CLEFAIRY
 	db 40 ; hp
 	db BASIC ; stage
@@ -8602,7 +8602,7 @@ ClefableCard: ; 337cc (c:77cc)
 	gfx ClefableCardGfx ; gfx
 	tx ClefableName ; name
 	db STAR ; rarity
-	db LABORATORY | JUNGLE ; set
+	db LABORATORY | JUNGLE ; sets
 	db CLEFABLE
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -8653,7 +8653,7 @@ Jigglypuff1Card: ; 3380d (c:780d)
 	gfx Jigglypuff1CardGfx ; gfx
 	tx JigglypuffName ; name
 	db PROMOSTAR ; rarity
-	db PROMOTIONAL | PRO ; set
+	db PROMOTIONAL | PRO ; sets
 	db JIGGLYPUFF1
 	db 50 ; hp
 	db BASIC ; stage
@@ -8704,7 +8704,7 @@ Jigglypuff2Card: ; 3384e (c:784e)
 	gfx Jigglypuff2CardGfx ; gfx
 	tx JigglypuffName ; name
 	db CIRCLE ; rarity
-	db EVOLUTION | GB ; set
+	db EVOLUTION | GB ; sets
 	db JIGGLYPUFF2
 	db 50 ; hp
 	db BASIC ; stage
@@ -8755,7 +8755,7 @@ Jigglypuff3Card: ; 3388f (c:788f)
 	gfx Jigglypuff3CardGfx ; gfx
 	tx JigglypuffName ; name
 	db CIRCLE ; rarity
-	db COLOSSEUM | JUNGLE ; set
+	db COLOSSEUM | JUNGLE ; sets
 	db JIGGLYPUFF3
 	db 60 ; hp
 	db BASIC ; stage
@@ -8806,7 +8806,7 @@ WigglytuffCard: ; 338d0 (c:78d0)
 	gfx WigglytuffCardGfx ; gfx
 	tx WigglytuffName ; name
 	db STAR ; rarity
-	db COLOSSEUM | JUNGLE ; set
+	db COLOSSEUM | JUNGLE ; sets
 	db WIGGLYTUFF
 	db 80 ; hp
 	db STAGE1 ; stage
@@ -8857,7 +8857,7 @@ Meowth1Card: ; 33911 (c:7911)
 	gfx Meowth1CardGfx ; gfx
 	tx MeowthName ; name
 	db CIRCLE ; rarity
-	db COLOSSEUM | GB ; set
+	db COLOSSEUM | GB ; sets
 	db MEOWTH1
 	db 50 ; hp
 	db BASIC ; stage
@@ -8908,7 +8908,7 @@ Meowth2Card: ; 33952 (c:7952)
 	gfx Meowth2CardGfx ; gfx
 	tx MeowthName ; name
 	db CIRCLE ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db MEOWTH2
 	db 50 ; hp
 	db BASIC ; stage
@@ -8959,7 +8959,7 @@ PersianCard: ; 33993 (c:7993)
 	gfx PersianCardGfx ; gfx
 	tx PersianName ; name
 	db DIAMOND ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db PERSIAN
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -9010,7 +9010,7 @@ FarfetchdCard: ; 339d4 (c:79d4)
 	gfx FarfetchdCardGfx ; gfx
 	tx FarfetchdName ; name
 	db DIAMOND ; rarity
-	db MYSTERY | NONE ; set
+	db MYSTERY | NONE ; sets
 	db FARFETCHD
 	db 50 ; hp
 	db BASIC ; stage
@@ -9061,7 +9061,7 @@ DoduoCard: ; 33a15 (c:7a15)
 	gfx DoduoCardGfx ; gfx
 	tx DoduoName ; name
 	db CIRCLE ; rarity
-	db LABORATORY | NONE ; set
+	db LABORATORY | NONE ; sets
 	db DODUO
 	db 50 ; hp
 	db BASIC ; stage
@@ -9112,7 +9112,7 @@ DodrioCard: ; 33a56 (c:7a56)
 	gfx DodrioCardGfx ; gfx
 	tx DodrioName ; name
 	db DIAMOND ; rarity
-	db LABORATORY | JUNGLE ; set
+	db LABORATORY | JUNGLE ; sets
 	db DODRIO
 	db 70 ; hp
 	db STAGE1 ; stage
@@ -9163,7 +9163,7 @@ LickitungCard: ; 33a97 (c:7a97)
 	gfx LickitungCardGfx ; gfx
 	tx LickitungName ; name
 	db DIAMOND ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db LICKITUNG
 	db 90 ; hp
 	db BASIC ; stage
@@ -9214,7 +9214,7 @@ ChanseyCard: ; 33ad8 (c:7ad8)
 	gfx ChanseyCardGfx ; gfx
 	tx ChanseyName ; name
 	db STAR ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db CHANSEY
 	db 120 ; hp
 	db BASIC ; stage
@@ -9265,7 +9265,7 @@ KangaskhanCard: ; 33b19 (c:7b19)
 	gfx KangaskhanCardGfx ; gfx
 	tx KangaskhanName ; name
 	db STAR ; rarity
-	db COLOSSEUM | JUNGLE ; set
+	db COLOSSEUM | JUNGLE ; sets
 	db KANGASKHAN
 	db 90 ; hp
 	db BASIC ; stage
@@ -9316,7 +9316,7 @@ TaurosCard: ; 33b5a (c:7b5a)
 	gfx TaurosCardGfx ; gfx
 	tx TaurosName ; name
 	db DIAMOND ; rarity
-	db MYSTERY | JUNGLE ; set
+	db MYSTERY | JUNGLE ; sets
 	db TAUROS
 	db 60 ; hp
 	db BASIC ; stage
@@ -9367,7 +9367,7 @@ DittoCard: ; 33b9b (c:7b9b)
 	gfx DittoCardGfx ; gfx
 	tx DittoName ; name
 	db STAR ; rarity
-	db LABORATORY | GB ; set
+	db LABORATORY | GB ; sets
 	db DITTO
 	db 50 ; hp
 	db BASIC ; stage
@@ -9418,7 +9418,7 @@ EeveeCard: ; 33bdc (c:7bdc)
 	gfx EeveeCardGfx ; gfx
 	tx EeveeName ; name
 	db CIRCLE ; rarity
-	db EVOLUTION | JUNGLE ; set
+	db EVOLUTION | JUNGLE ; sets
 	db EEVEE
 	db 50 ; hp
 	db BASIC ; stage
@@ -9469,7 +9469,7 @@ PorygonCard: ; 33c1d (c:7c1d)
 	gfx PorygonCardGfx ; gfx
 	tx PorygonName ; name
 	db DIAMOND ; rarity
-	db LABORATORY | NONE ; set
+	db LABORATORY | NONE ; sets
 	db PORYGON
 	db 30 ; hp
 	db BASIC ; stage
@@ -9520,7 +9520,7 @@ SnorlaxCard: ; 33c5e (c:7c5e)
 	gfx SnorlaxCardGfx ; gfx
 	tx SnorlaxName ; name
 	db STAR ; rarity
-	db COLOSSEUM | JUNGLE ; set
+	db COLOSSEUM | JUNGLE ; sets
 	db SNORLAX
 	db 90 ; hp
 	db BASIC ; stage
@@ -9571,7 +9571,7 @@ DratiniCard: ; 33c9f (c:7c9f)
 	gfx DratiniCardGfx ; gfx
 	tx DratiniName ; name
 	db DIAMOND ; rarity
-	db MYSTERY | NONE ; set
+	db MYSTERY | NONE ; sets
 	db DRATINI
 	db 40 ; hp
 	db BASIC ; stage
@@ -9622,7 +9622,7 @@ DragonairCard: ; 33ce0 (c:7ce0)
 	gfx DragonairCardGfx ; gfx
 	tx DragonairName ; name
 	db STAR ; rarity
-	db MYSTERY | NONE ; set
+	db MYSTERY | NONE ; sets
 	db DRAGONAIR
 	db 80 ; hp
 	db STAGE1 ; stage
@@ -9673,7 +9673,7 @@ Dragonite1Card: ; 33d21 (c:7d21)
 	gfx Dragonite1CardGfx ; gfx
 	tx DragoniteName ; name
 	db STAR ; rarity
-	db PROMOTIONAL | GB ; set
+	db PROMOTIONAL | GB ; sets
 	db DRAGONITE1
 	db 100 ; hp
 	db STAGE2 ; stage
@@ -9724,7 +9724,7 @@ Dragonite2Card: ; 33d62 (c:7d62)
 	gfx Dragonite2CardGfx ; gfx
 	tx DragoniteName ; name
 	db STAR ; rarity
-	db MYSTERY | FOSSIL ; set
+	db MYSTERY | FOSSIL ; sets
 	db DRAGONITE2
 	db 100 ; hp
 	db STAGE2 ; stage
@@ -9775,7 +9775,7 @@ GrassEnergyCard: ; 33da3 (c:7da3)
 	gfx GrassEnergyCardGfx ; gfx
 	tx GrassEnergyName ; name
 	db CIRCLE ; rarity
-	db ENERGY | NONE ; set
+	db ENERGY | NONE ; sets
 	db GRASS_ENERGY
 	dw GrassEnergyEffectCommands ; effect commands
 	tx GrassEnergyDescription ; description
@@ -9786,7 +9786,7 @@ FireEnergyCard: ; 33db1 (c:7db1)
 	gfx FireEnergyCardGfx ; gfx
 	tx FireEnergyName ; name
 	db CIRCLE ; rarity
-	db ENERGY | NONE ; set
+	db ENERGY | NONE ; sets
 	db FIRE_ENERGY
 	dw FireEnergyEffectCommands ; effect commands
 	tx FireEnergyDescription ; description
@@ -9797,7 +9797,7 @@ WaterEnergyCard: ; 33dbf (c:7dbf)
 	gfx WaterEnergyCardGfx ; gfx
 	tx WaterEnergyName ; name
 	db CIRCLE ; rarity
-	db ENERGY | NONE ; set
+	db ENERGY | NONE ; sets
 	db WATER_ENERGY
 	dw WaterEnergyEffectCommands ; effect commands
 	tx WaterEnergyDescription ; description
@@ -9808,7 +9808,7 @@ LightningEnergyCard: ; 33dcd (c:7dcd)
 	gfx LightningEnergyCardGfx ; gfx
 	tx LightningEnergyName ; name
 	db CIRCLE ; rarity
-	db ENERGY | NONE ; set
+	db ENERGY | NONE ; sets
 	db LIGHTNING_ENERGY
 	dw LightningEnergyEffectCommands ; effect commands
 	tx LightningEnergyDescription ; description
@@ -9819,7 +9819,7 @@ FightingEnergyCard: ; 33ddb (c:7ddb)
 	gfx FightingEnergyCardGfx ; gfx
 	tx FightingEnergyName ; name
 	db CIRCLE ; rarity
-	db ENERGY | NONE ; set
+	db ENERGY | NONE ; sets
 	db FIGHTING_ENERGY
 	dw FightingEnergyEffectCommands ; effect commands
 	tx FightingEnergyDescription ; description
@@ -9830,7 +9830,7 @@ PsychicEnergyCard: ; 33de9 (c:7de9)
 	gfx PsychicEnergyCardGfx ; gfx
 	tx PsychicEnergyName ; name
 	db CIRCLE ; rarity
-	db ENERGY | NONE ; set
+	db ENERGY | NONE ; sets
 	db PSYCHIC_ENERGY
 	dw PsychicEnergyEffectCommands ; effect commands
 	tx PsychicEnergyDescription ; description
@@ -9841,7 +9841,7 @@ DoubleColorlessEnergyCard: ; 33df7 (c:7df7)
 	gfx DoubleColorlessEnergyCardGfx ; gfx
 	tx DoubleColorlessEnergyName ; name
 	db DIAMOND ; rarity
-	db ENERGY | NONE ; set
+	db ENERGY | NONE ; sets
 	db DOUBLE_COLORLESS_ENERGY
 	dw DoubleColorlessEnergyEffectCommands ; effect commands
 	tx DoubleColorlessEnergyDescription ; description
@@ -9852,7 +9852,7 @@ ProfessorOakCard: ; 33e05 (c:7e05)
 	gfx ProfessorOakCardGfx ; gfx
 	tx ProfessorOakName ; name
 	db DIAMOND ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db PROFESSOR_OAK
 	dw ProfessorOakEffectCommands ; effect commands
 	tx ProfessorOakDescription ; description
@@ -9863,7 +9863,7 @@ ImposterProfessorOakCard: ; 33e13 (c:7e13)
 	gfx ImposterProfessorOakCardGfx ; gfx
 	tx ImposterProfessorOakName ; name
 	db STAR ; rarity
-	db LABORATORY | NONE ; set
+	db LABORATORY | NONE ; sets
 	db IMPOSTER_PROFESSOR_OAK
 	dw ImposterProfessorOakEffectCommands ; effect commands
 	tx ImposterProfessorOakDescription ; description
@@ -9874,7 +9874,7 @@ BillCard: ; 33e21 (c:7e21)
 	gfx BillCardGfx ; gfx
 	tx BillName ; name
 	db CIRCLE ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db BILL
 	dw BillEffectCommands ; effect commands
 	tx BillDescription ; description
@@ -9885,7 +9885,7 @@ MrFujiCard: ; 33e2f (c:7e2f)
 	gfx MrFujiCardGfx ; gfx
 	tx MrFujiName ; name
 	db DIAMOND ; rarity
-	db MYSTERY | FOSSIL ; set
+	db MYSTERY | FOSSIL ; sets
 	db MR_FUJI
 	dw MrFujiEffectCommands ; effect commands
 	tx MrFujiDescription ; description
@@ -9896,7 +9896,7 @@ LassCard: ; 33e3d (c:7e3d)
 	gfx LassCardGfx ; gfx
 	tx LassName ; name
 	db STAR ; rarity
-	db LABORATORY | NONE ; set
+	db LABORATORY | NONE ; sets
 	db LASS
 	dw LassEffectCommands ; effect commands
 	tx LassDescription ; description
@@ -9907,7 +9907,7 @@ ImakuniCard: ; 33e4b (c:7e4b)
 	gfx ImakuniCardGfx ; gfx
 	tx ImakuniName ; name
 	db PROMOSTAR ; rarity
-	db PROMOTIONAL | PRO ; set
+	db PROMOTIONAL | PRO ; sets
 	db IMAKUNI_CARD
 	dw ImakuniEffectCommands ; effect commands
 	tx ImakuniDescription ; description
@@ -9918,7 +9918,7 @@ PokemonTraderCard: ; 33e59 (c:7e59)
 	gfx PokemonTraderCardGfx ; gfx
 	tx PokemonTraderName ; name
 	db STAR ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db POKEMON_TRADER
 	dw PokemonTraderEffectCommands ; effect commands
 	tx PokemonTraderDescription ; description
@@ -9929,7 +9929,7 @@ PokemonBreederCard: ; 33e67 (c:7e67)
 	gfx PokemonBreederCardGfx ; gfx
 	tx PokemonBreederName ; name
 	db STAR ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db POKEMON_BREEDER
 	dw PokemonBreederEffectCommands ; effect commands
 	tx PokemonBreederDescription ; description
@@ -9940,7 +9940,7 @@ ClefairyDollCard: ; 33e75 (c:7e75)
 	gfx ClefairyDollCardGfx ; gfx
 	tx ClefairyDollName ; name
 	db STAR ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db CLEFAIRY_DOLL
 	dw ClefairyDollEffectCommands ; effect commands
 	tx ClefairyDollDescription ; description
@@ -9951,7 +9951,7 @@ MysteriousFossilCard: ; 33e83 (c:7e83)
 	gfx MysteriousFossilCardGfx ; gfx
 	tx MysteriousFossilName ; name
 	db CIRCLE ; rarity
-	db MYSTERY | FOSSIL ; set
+	db MYSTERY | FOSSIL ; sets
 	db MYSTERIOUS_FOSSIL
 	dw MysteriousFossilEffectCommands ; effect commands
 	tx MysteriousFossilDescription ; description
@@ -9962,7 +9962,7 @@ EnergyRetrievalCard: ; 33e91 (c:7e91)
 	gfx EnergyRetrievalCardGfx ; gfx
 	tx EnergyRetrievalName ; name
 	db DIAMOND ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db ENERGY_RETRIEVAL
 	dw EnergyRetrievalEffectCommands ; effect commands
 	tx EnergyRetrievalDescription ; description
@@ -9973,7 +9973,7 @@ SuperEnergyRetrievalCard: ; 33e9f (c:7e9f)
 	gfx SuperEnergyRetrievalCardGfx ; gfx
 	tx SuperEnergyRetrievalName ; name
 	db PROMOSTAR ; rarity
-	db PROMOTIONAL | PRO ; set
+	db PROMOTIONAL | PRO ; sets
 	db SUPER_ENERGY_RETRIEVAL
 	dw SuperEnergyRetrievalEffectCommands ; effect commands
 	tx SuperEnergyRetrievalDescription ; description
@@ -9984,7 +9984,7 @@ EnergySearchCard: ; 33ead (c:7ead)
 	gfx EnergySearchCardGfx ; gfx
 	tx EnergySearchName ; name
 	db CIRCLE ; rarity
-	db EVOLUTION | FOSSIL ; set
+	db EVOLUTION | FOSSIL ; sets
 	db ENERGY_SEARCH
 	dw EnergySearchEffectCommands ; effect commands
 	tx EnergySearchDescription ; description
@@ -9995,7 +9995,7 @@ EnergyRemovalCard: ; 33ebb (c:7ebb)
 	gfx EnergyRemovalCardGfx ; gfx
 	tx EnergyRemovalName ; name
 	db CIRCLE ; rarity
-	db MYSTERY | NONE ; set
+	db MYSTERY | NONE ; sets
 	db ENERGY_REMOVAL
 	dw EnergyRemovalEffectCommands ; effect commands
 	tx EnergyRemovalDescription ; description
@@ -10006,7 +10006,7 @@ SuperEnergyRemovalCard: ; 33ec9 (c:7ec9)
 	gfx SuperEnergyRemovalCardGfx ; gfx
 	tx SuperEnergyRemovalName ; name
 	db STAR ; rarity
-	db LABORATORY | NONE ; set
+	db LABORATORY | NONE ; sets
 	db SUPER_ENERGY_REMOVAL
 	dw SuperEnergyRemovalEffectCommands ; effect commands
 	tx SuperEnergyRemovalDescription ; description
@@ -10017,7 +10017,7 @@ SwitchCard: ; 33ed7 (c:7ed7)
 	gfx SwitchCardGfx ; gfx
 	tx SwitchName ; name
 	db CIRCLE ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db SWITCH
 	dw SwitchEffectCommands ; effect commands
 	tx SwitchDescription ; description
@@ -10028,7 +10028,7 @@ PokemonCenterCard: ; 33ee5 (c:7ee5)
 	gfx PokemonCenterCardGfx ; gfx
 	tx PokemonCenterName ; name
 	db DIAMOND ; rarity
-	db MYSTERY | NONE ; set
+	db MYSTERY | NONE ; sets
 	db POKEMON_CENTER
 	dw PokemonCenterEffectCommands ; effect commands
 	tx PokemonCenterDescription ; description
@@ -10039,7 +10039,7 @@ PokeBallCard: ; 33ef3 (c:7ef3)
 	gfx PokeBallCardGfx ; gfx
 	tx PokeBallName ; name
 	db CIRCLE ; rarity
-	db COLOSSEUM | JUNGLE ; set
+	db COLOSSEUM | JUNGLE ; sets
 	db POKE_BALL
 	dw PokeBallEffectCommands ; effect commands
 	tx PokeBallDescription ; description
@@ -10050,7 +10050,7 @@ ScoopUpCard: ; 33f01 (c:7f01)
 	gfx ScoopUpCardGfx ; gfx
 	tx ScoopUpName ; name
 	db STAR ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db SCOOP_UP
 	dw ScoopUpEffectCommands ; effect commands
 	tx ScoopUpDescription ; description
@@ -10061,7 +10061,7 @@ ComputerSearchCard: ; 33f0f (c:7f0f)
 	gfx ComputerSearchCardGfx ; gfx
 	tx ComputerSearchName ; name
 	db STAR ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db COMPUTER_SEARCH
 	dw ComputerSearchEffectCommands ; effect commands
 	tx ComputerSearchDescription ; description
@@ -10072,7 +10072,7 @@ PokedexCard: ; 33f1d (c:7f1d)
 	gfx PokedexCardGfx ; gfx
 	tx PokedexName ; name
 	db DIAMOND ; rarity
-	db LABORATORY | NONE ; set
+	db LABORATORY | NONE ; sets
 	db POKEDEX
 	dw PokedexEffectCommands ; effect commands
 	tx PokedexDescription ; description
@@ -10083,7 +10083,7 @@ PlusPowerCard: ; 33f2b (c:7f2b)
 	gfx PlusPowerCardGfx ; gfx
 	tx PlusPowerName ; name
 	db DIAMOND ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db PLUSPOWER
 	dw PlusPowerEffectCommands ; effect commands
 	tx PlusPowerDescription ; description
@@ -10094,7 +10094,7 @@ DefenderCard: ; 33f39 (c:7f39)
 	gfx DefenderCardGfx ; gfx
 	tx DefenderName ; name
 	db DIAMOND ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db DEFENDER
 	dw DefenderEffectCommands ; effect commands
 	tx DefenderDescription ; description
@@ -10105,7 +10105,7 @@ ItemFinderCard: ; 33f47 (c:7f47)
 	gfx ItemFinderCardGfx ; gfx
 	tx ItemFinderName ; name
 	db STAR ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db ITEM_FINDER
 	dw ItemFinderEffectCommands ; effect commands
 	tx ItemFinderDescription ; description
@@ -10116,7 +10116,7 @@ GustofWindCard: ; 33f55 (c:7f55)
 	gfx GustofWindCardGfx ; gfx
 	tx GustofWindName ; name
 	db CIRCLE ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db GUST_OF_WIND
 	dw GustofWindEffectCommands ; effect commands
 	tx GustofWindDescription ; description
@@ -10127,7 +10127,7 @@ DevolutionSprayCard: ; 33f63 (c:7f63)
 	gfx DevolutionSprayCardGfx ; gfx
 	tx DevolutionSprayName ; name
 	db STAR ; rarity
-	db LABORATORY | NONE ; set
+	db LABORATORY | NONE ; sets
 	db DEVOLUTION_SPRAY
 	dw DevolutionSprayEffectCommands ; effect commands
 	tx DevolutionSprayDescription ; description
@@ -10138,7 +10138,7 @@ PotionCard: ; 33f71 (c:7f71)
 	gfx PotionCardGfx ; gfx
 	tx PotionName ; name
 	db CIRCLE ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db POTION
 	dw PotionEffectCommands ; effect commands
 	tx PotionDescription ; description
@@ -10149,7 +10149,7 @@ SuperPotionCard: ; 33f7f (c:7f7f)
 	gfx SuperPotionCardGfx ; gfx
 	tx SuperPotionName ; name
 	db DIAMOND ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db SUPER_POTION
 	dw SuperPotionEffectCommands ; effect commands
 	tx SuperPotionDescription ; description
@@ -10160,7 +10160,7 @@ FullHealCard: ; 33f8d (c:7f8d)
 	gfx FullHealCardGfx ; gfx
 	tx FullHealName ; name
 	db DIAMOND ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db FULL_HEAL
 	dw FullHealEffectCommands ; effect commands
 	tx FullHealDescription ; description
@@ -10171,7 +10171,7 @@ ReviveCard: ; 33f9b (c:7f9b)
 	gfx ReviveCardGfx ; gfx
 	tx ReviveName ; name
 	db DIAMOND ; rarity
-	db COLOSSEUM | NONE ; set
+	db COLOSSEUM | NONE ; sets
 	db REVIVE
 	dw ReviveEffectCommands ; effect commands
 	tx ReviveDescription ; description
@@ -10182,7 +10182,7 @@ MaintenanceCard: ; 33fa9 (c:7fa9)
 	gfx MaintenanceCardGfx ; gfx
 	tx MaintenanceName ; name
 	db DIAMOND ; rarity
-	db LABORATORY | NONE ; set
+	db LABORATORY | NONE ; sets
 	db MAINTENANCE
 	dw MaintenanceEffectCommands ; effect commands
 	tx MaintenanceDescription ; description
@@ -10193,7 +10193,7 @@ PokemonFluteCard: ; 33fb7 (c:7fb7)
 	gfx PokemonFluteCardGfx ; gfx
 	tx PokemonFluteName ; name
 	db DIAMOND ; rarity
-	db EVOLUTION | NONE ; set
+	db EVOLUTION | NONE ; sets
 	db POKEMON_FLUTE
 	dw PokemonFluteEffectCommands ; effect commands
 	tx PokemonFluteDescription ; description
@@ -10204,7 +10204,7 @@ GamblerCard: ; 33fc5 (c:7fc5)
 	gfx GamblerCardGfx ; gfx
 	tx GamblerName ; name
 	db CIRCLE ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db GAMBLER
 	dw GamblerEffectCommands ; effect commands
 	tx GamblerDescription ; description
@@ -10215,7 +10215,7 @@ RecycleCard: ; 33fd3 (c:7fd3)
 	gfx RecycleCardGfx ; gfx
 	tx RecycleName ; name
 	db CIRCLE ; rarity
-	db LABORATORY | FOSSIL ; set
+	db LABORATORY | FOSSIL ; sets
 	db RECYCLE
 	dw RecycleEffectCommands ; effect commands
 	tx RecycleDescription ; description
-- 
cgit v1.2.3