Merge pull request #330 from PikalaxALT/scriptmacrorenaming

Scriptmacrorenaming

20 files changed, 1278 insertions, 286 deletions

diff --git a/constants/animation_constants.asm b/constants/animation_constants.asm
index 27cb1f319..5ae2f324f 100644
--- a/constants/animation_constants.asm
+++ b/constants/animation_constants.asm
@@ -1,42 +1,761 @@
+	const_def
+	const BATTLEANIMSTRUCT_INDEX
+	const BATTLEANIMSTRUCT_01
+	const BATTLEANIMSTRUCT_02
+	const BATTLEANIMSTRUCT_FRAMESET_ID
+	const BATTLEANIMSTRUCT_FUNCTION
+	const BATTLEANIMSTRUCT_PALETTE
+    const BATTLEANIMSTRUCT_TILEID
+    const BATTLEANIMSTRUCT_XCOORD
+    const BATTLEANIMSTRUCT_YCOORD
+    const BATTLEANIMSTRUCT_XOFFSET
+    const BATTLEANIMSTRUCT_YOFFSET
+    const BATTLEANIMSTRUCT_0B
+    const BATTLEANIMSTRUCT_DURATION
+    const BATTLEANIMSTRUCT_FRAME
+    const BATTLEANIMSTRUCT_ANON_JT_INDEX
+    const BATTLEANIMSTRUCT_0F
+    const BATTLEANIMSTRUCT_10
+    const BATTLEANIMSTRUCT_11
+    const BATTLEANIMSTRUCT_12
+    const BATTLEANIMSTRUCT_13
+    const BATTLEANIMSTRUCT_14
+    const BATTLEANIMSTRUCT_15
+    const BATTLEANIMSTRUCT_16
+    const BATTLEANIMSTRUCT_17
+BATTLEANIMSTRUCT_LENGTH EQU const_value
 
-ANIM_OBJ_BURNED EQU $10
-ANIM_OBJ_FROZEN EQU $2a
-ANIM_OBJ_GUST EQU $3e
-ANIM_OBJ_CHICK EQU $52
-ANIM_OBJ_SKULL EQU $55
-ANIM_OBJ_PARALYZED EQU $59
-ANIM_OBJ_HEART EQU $7e
-ANIM_OBJ_FLOWER EQU $b6
-ANIM_OBJ_COTTON EQU $b7
+	const_def
+	const ANIM_OBJ_00
+    const ANIM_OBJ_01
+    const ANIM_OBJ_02
+    const ANIM_OBJ_03
+    const ANIM_OBJ_04
+    const ANIM_OBJ_05
+    const ANIM_OBJ_06
+    const ANIM_OBJ_07
+    const ANIM_OBJ_08
+    const ANIM_OBJ_09
+    const ANIM_OBJ_0A
+    const ANIM_OBJ_0B
+    const ANIM_OBJ_0C
+    const ANIM_OBJ_0D
+    const ANIM_OBJ_0E
+    const ANIM_OBJ_0F
+    const ANIM_OBJ_BURNED
+    const ANIM_OBJ_11
+    const ANIM_OBJ_12
+    const ANIM_OBJ_13
+    const ANIM_OBJ_14
+    const ANIM_OBJ_POKE_BALL
+    const ANIM_OBJ_16
+    const ANIM_OBJ_17
+    const ANIM_OBJ_18
+    const ANIM_OBJ_19
+    const ANIM_OBJ_1A
+    const ANIM_OBJ_1B
+    const ANIM_OBJ_1C
+    const ANIM_OBJ_1D
+    const ANIM_OBJ_1E
+    const ANIM_OBJ_1F
+    const ANIM_OBJ_20
+    const ANIM_OBJ_21
+    const ANIM_OBJ_22
+    const ANIM_OBJ_23
+    const ANIM_OBJ_24
+    const ANIM_OBJ_25
+    const ANIM_OBJ_26
+    const ANIM_OBJ_27
+    const ANIM_OBJ_28
+    const ANIM_OBJ_29
+    const ANIM_OBJ_FROZEN
+    const ANIM_OBJ_2B
+    const ANIM_OBJ_2C
+    const ANIM_OBJ_2D
+    const ANIM_OBJ_2E
+    const ANIM_OBJ_2F
+    const ANIM_OBJ_30
+    const ANIM_OBJ_31
+    const ANIM_OBJ_32
+    const ANIM_OBJ_33
+    const ANIM_OBJ_34
+    const ANIM_OBJ_35
+    const ANIM_OBJ_36
+    const ANIM_OBJ_37
+    const ANIM_OBJ_38
+    const ANIM_OBJ_39
+    const ANIM_OBJ_3A
+    const ANIM_OBJ_3B
+    const ANIM_OBJ_3C
+    const ANIM_OBJ_3D
+    const ANIM_OBJ_GUST
+    const ANIM_OBJ_3F
+    const ANIM_OBJ_40
+    const ANIM_OBJ_41
+    const ANIM_OBJ_42
+    const ANIM_OBJ_43
+    const ANIM_OBJ_44
+    const ANIM_OBJ_45
+    const ANIM_OBJ_46
+    const ANIM_OBJ_47
+    const ANIM_OBJ_48
+    const ANIM_OBJ_49
+    const ANIM_OBJ_4A
+    const ANIM_OBJ_4B
+    const ANIM_OBJ_4C
+    const ANIM_OBJ_4D
+    const ANIM_OBJ_4E
+    const ANIM_OBJ_4F
+    const ANIM_OBJ_50
+    const ANIM_OBJ_51
+    const ANIM_OBJ_CHICK
+    const ANIM_OBJ_53
+    const ANIM_OBJ_54
+    const ANIM_OBJ_SKULL
+    const ANIM_OBJ_56
+    const ANIM_OBJ_57
+    const ANIM_OBJ_58
+    const ANIM_OBJ_PARALYZED
+    const ANIM_OBJ_5A
+    const ANIM_OBJ_5B
+    const ANIM_OBJ_5C
+    const ANIM_OBJ_5D
+    const ANIM_OBJ_5E
+    const ANIM_OBJ_5F
+    const ANIM_OBJ_60
+    const ANIM_OBJ_61
+    const ANIM_OBJ_62
+    const ANIM_OBJ_63
+    const ANIM_OBJ_64
+    const ANIM_OBJ_65
+    const ANIM_OBJ_66
+    const ANIM_OBJ_67
+    const ANIM_OBJ_68
+    const ANIM_OBJ_69
+    const ANIM_OBJ_6A
+    const ANIM_OBJ_6B
+    const ANIM_OBJ_6C
+    const ANIM_OBJ_6D
+    const ANIM_OBJ_6E
+    const ANIM_OBJ_6F
+    const ANIM_OBJ_70
+    const ANIM_OBJ_71
+    const ANIM_OBJ_72
+    const ANIM_OBJ_73
+    const ANIM_OBJ_74
+    const ANIM_OBJ_75
+    const ANIM_OBJ_76
+    const ANIM_OBJ_77
+    const ANIM_OBJ_78
+    const ANIM_OBJ_79
+    const ANIM_OBJ_7A
+    const ANIM_OBJ_7B
+    const ANIM_OBJ_7C
+    const ANIM_OBJ_7D
+    const ANIM_OBJ_HEART
+    const ANIM_OBJ_7F
+    const ANIM_OBJ_80
+    const ANIM_OBJ_81
+    const ANIM_OBJ_82
+    const ANIM_OBJ_83
+    const ANIM_OBJ_84
+    const ANIM_OBJ_85
+    const ANIM_OBJ_86
+    const ANIM_OBJ_87
+    const ANIM_OBJ_88
+    const ANIM_OBJ_89
+    const ANIM_OBJ_8A
+    const ANIM_OBJ_8B
+    const ANIM_OBJ_8C
+    const ANIM_OBJ_8D
+    const ANIM_OBJ_8E
+    const ANIM_OBJ_8F
+    const ANIM_OBJ_90
+    const ANIM_OBJ_91
+    const ANIM_OBJ_92
+    const ANIM_OBJ_93
+    const ANIM_OBJ_94
+    const ANIM_OBJ_95
+    const ANIM_OBJ_96
+    const ANIM_OBJ_97
+    const ANIM_OBJ_98
+    const ANIM_OBJ_99
+    const ANIM_OBJ_9A
+    const ANIM_OBJ_9B
+    const ANIM_OBJ_9C
+    const ANIM_OBJ_9D
+    const ANIM_OBJ_9E
+    const ANIM_OBJ_9F
+    const ANIM_OBJ_A0
+    const ANIM_OBJ_A1
+    const ANIM_OBJ_A2
+    const ANIM_OBJ_A3
+    const ANIM_OBJ_A4
+    const ANIM_OBJ_A5
+    const ANIM_OBJ_A6
+    const ANIM_OBJ_A7
+    const ANIM_OBJ_A8
+    const ANIM_OBJ_A9
+    const ANIM_OBJ_AA
+    const ANIM_OBJ_AB
+    const ANIM_OBJ_AC
+    const ANIM_OBJ_AD
+    const ANIM_OBJ_AE
+    const ANIM_OBJ_AF
+    const ANIM_OBJ_B0
+    const ANIM_OBJ_B1
+    const ANIM_OBJ_B2
+    const ANIM_OBJ_B3
+    const ANIM_OBJ_B4
+    const ANIM_OBJ_B5
+    const ANIM_OBJ_FLOWER
+    const ANIM_OBJ_COTTON
+    const ANIM_OBJ_PLAYERFEETFOLLOW
+    const ANIM_OBJ_ENEMYFEETFOLLOW
+    const ANIM_OBJ_BA
+    const ANIM_OBJ_BB
 
-ANIM_BG_FLASH_INVERTED EQU $01
-ANIM_BG_FLASH_WHITE EQU $02
-ANIM_BG_WHITE_HUES EQU $03
-ANIM_BG_BLACK_HUES EQU $04
-ANIM_BG_ALTERNATE_HUES EQU $05
-; ???? EQU $06
-; ???? EQU $07
-; ???? EQU $08
-ANIM_BG_HIDE_MON EQU $09
-ANIM_BG_SHOW_MON EQU $0a
-ANIM_BG_ENTER_MON EQU $0b
-ANIM_BG_RETURN_MON EQU $0c
-ANIM_BG_SURF EQU $0d
-ANIM_BG_WHIRLPOOL EQU $0e
-ANIM_BG_TELEPORT EQU $0f
-ANIM_BG_NIGHT_SHADE EQU $10
-ANIM_BG_FEET_FOLLOW EQU $11
-ANIM_BG_HEAD_FOLLOW EQU $12
-ANIM_BG_DOUBLE_TEAM EQU $13
-ANIM_BG_ACID_ARMOR EQU $14
-ANIM_BG_RAPID_FLASH EQU $15 ; unused
+	const_def
+	const BATTLEANIMFUNC_00
+    const BATTLEANIMFUNC_01
+    const BATTLEANIMFUNC_02
+    const BATTLEANIMFUNC_03
+    const BATTLEANIMFUNC_04
+    const BATTLEANIMFUNC_05
+    const BATTLEANIMFUNC_06
+    const BATTLEANIMFUNC_07
+    const BATTLEANIMFUNC_08
+    const BATTLEANIMFUNC_09
+    const BATTLEANIMFUNC_0A
+    const BATTLEANIMFUNC_0B
+    const BATTLEANIMFUNC_0C
+    const BATTLEANIMFUNC_0D
+    const BATTLEANIMFUNC_0E
+    const BATTLEANIMFUNC_0F
+    const BATTLEANIMFUNC_10
+    const BATTLEANIMFUNC_11
+    const BATTLEANIMFUNC_12
+    const BATTLEANIMFUNC_13
+    const BATTLEANIMFUNC_14
+    const BATTLEANIMFUNC_15
+    const BATTLEANIMFUNC_16
+    const BATTLEANIMFUNC_17
+    const BATTLEANIMFUNC_18
+    const BATTLEANIMFUNC_19
+    const BATTLEANIMFUNC_1A
+    const BATTLEANIMFUNC_1B
+    const BATTLEANIMFUNC_1C
+    const BATTLEANIMFUNC_1D
+    const BATTLEANIMFUNC_1E
+    const BATTLEANIMFUNC_1F
+    const BATTLEANIMFUNC_20
+    const BATTLEANIMFUNC_21
+    const BATTLEANIMFUNC_22
+    const BATTLEANIMFUNC_23
+    const BATTLEANIMFUNC_24
+    const BATTLEANIMFUNC_25
+    const BATTLEANIMFUNC_26
+    const BATTLEANIMFUNC_27
+    const BATTLEANIMFUNC_28
+    const BATTLEANIMFUNC_29
+    const BATTLEANIMFUNC_2A
+    const BATTLEANIMFUNC_2B
+    const BATTLEANIMFUNC_2C
+    const BATTLEANIMFUNC_2D
+    const BATTLEANIMFUNC_2E
+    const BATTLEANIMFUNC_2F
+    const BATTLEANIMFUNC_30
+    const BATTLEANIMFUNC_31
+    const BATTLEANIMFUNC_32
+    const BATTLEANIMFUNC_33
+    const BATTLEANIMFUNC_34
+    const BATTLEANIMFUNC_35
+    const BATTLEANIMFUNC_36
+    const BATTLEANIMFUNC_37
+    const BATTLEANIMFUNC_38
+    const BATTLEANIMFUNC_39
+    const BATTLEANIMFUNC_3A
+    const BATTLEANIMFUNC_3B
+    const BATTLEANIMFUNC_3C
+    const BATTLEANIMFUNC_3D
+    const BATTLEANIMFUNC_3E
+    const BATTLEANIMFUNC_3F
+    const BATTLEANIMFUNC_40
+    const BATTLEANIMFUNC_41
+    const BATTLEANIMFUNC_42
+    const BATTLEANIMFUNC_43
+    const BATTLEANIMFUNC_44
+    const BATTLEANIMFUNC_45
+    const BATTLEANIMFUNC_46
+    const BATTLEANIMFUNC_47
+    const BATTLEANIMFUNC_48
+    const BATTLEANIMFUNC_49
+    const BATTLEANIMFUNC_4A
+    const BATTLEANIMFUNC_4B
+    const BATTLEANIMFUNC_4C
+    const BATTLEANIMFUNC_4D
+    const BATTLEANIMFUNC_4E
+    const BATTLEANIMFUNC_4F
 
-ANIM_BG_TACKLE EQU $24
+	const_def
+	const BATTLEANIMFRAMESET_00
+    const BATTLEANIMFRAMESET_01
+    const BATTLEANIMFRAMESET_02
+    const BATTLEANIMFRAMESET_03
+    const BATTLEANIMFRAMESET_04
+    const BATTLEANIMFRAMESET_05
+    const BATTLEANIMFRAMESET_06
+    const BATTLEANIMFRAMESET_07
+    const BATTLEANIMFRAMESET_08
+    const BATTLEANIMFRAMESET_09
+    const BATTLEANIMFRAMESET_0A
+    const BATTLEANIMFRAMESET_0B
+    const BATTLEANIMFRAMESET_0C
+    const BATTLEANIMFRAMESET_0D
+    const BATTLEANIMFRAMESET_0E
+    const BATTLEANIMFRAMESET_0F
+    const BATTLEANIMFRAMESET_10
+    const BATTLEANIMFRAMESET_11
+    const BATTLEANIMFRAMESET_12
+    const BATTLEANIMFRAMESET_13
+    const BATTLEANIMFRAMESET_14
+    const BATTLEANIMFRAMESET_15
+    const BATTLEANIMFRAMESET_16
+    const BATTLEANIMFRAMESET_17
+    const BATTLEANIMFRAMESET_18
+    const BATTLEANIMFRAMESET_19
+    const BATTLEANIMFRAMESET_1A
+    const BATTLEANIMFRAMESET_1B
+    const BATTLEANIMFRAMESET_1C
+    const BATTLEANIMFRAMESET_1D
+    const BATTLEANIMFRAMESET_1E
+    const BATTLEANIMFRAMESET_1F
+    const BATTLEANIMFRAMESET_20
+    const BATTLEANIMFRAMESET_21
+    const BATTLEANIMFRAMESET_22
+    const BATTLEANIMFRAMESET_23
+    const BATTLEANIMFRAMESET_24
+    const BATTLEANIMFRAMESET_25
+    const BATTLEANIMFRAMESET_26
+    const BATTLEANIMFRAMESET_27
+    const BATTLEANIMFRAMESET_28
+    const BATTLEANIMFRAMESET_29
+    const BATTLEANIMFRAMESET_2A
+    const BATTLEANIMFRAMESET_2B
+    const BATTLEANIMFRAMESET_2C
+    const BATTLEANIMFRAMESET_2D
+    const BATTLEANIMFRAMESET_2E
+    const BATTLEANIMFRAMESET_2F
+    const BATTLEANIMFRAMESET_30
+    const BATTLEANIMFRAMESET_31
+    const BATTLEANIMFRAMESET_32
+    const BATTLEANIMFRAMESET_33
+    const BATTLEANIMFRAMESET_34
+    const BATTLEANIMFRAMESET_35
+    const BATTLEANIMFRAMESET_36
+    const BATTLEANIMFRAMESET_37
+    const BATTLEANIMFRAMESET_38
+    const BATTLEANIMFRAMESET_39
+    const BATTLEANIMFRAMESET_3A
+    const BATTLEANIMFRAMESET_3B
+    const BATTLEANIMFRAMESET_3C
+    const BATTLEANIMFRAMESET_3D
+    const BATTLEANIMFRAMESET_3E
+    const BATTLEANIMFRAMESET_3F
+    const BATTLEANIMFRAMESET_40
+    const BATTLEANIMFRAMESET_41
+    const BATTLEANIMFRAMESET_42
+    const BATTLEANIMFRAMESET_43
+    const BATTLEANIMFRAMESET_44
+    const BATTLEANIMFRAMESET_45
+    const BATTLEANIMFRAMESET_46
+    const BATTLEANIMFRAMESET_47
+    const BATTLEANIMFRAMESET_48
+    const BATTLEANIMFRAMESET_49
+    const BATTLEANIMFRAMESET_4A
+    const BATTLEANIMFRAMESET_4B
+    const BATTLEANIMFRAMESET_4C
+    const BATTLEANIMFRAMESET_4D
+    const BATTLEANIMFRAMESET_4E
+    const BATTLEANIMFRAMESET_4F
+    const BATTLEANIMFRAMESET_50
+    const BATTLEANIMFRAMESET_51
+    const BATTLEANIMFRAMESET_52
+    const BATTLEANIMFRAMESET_53
+    const BATTLEANIMFRAMESET_54
+    const BATTLEANIMFRAMESET_55
+    const BATTLEANIMFRAMESET_56
+    const BATTLEANIMFRAMESET_57
+    const BATTLEANIMFRAMESET_58
+    const BATTLEANIMFRAMESET_59
+    const BATTLEANIMFRAMESET_5A
+    const BATTLEANIMFRAMESET_5B
+    const BATTLEANIMFRAMESET_5C
+    const BATTLEANIMFRAMESET_5D
+    const BATTLEANIMFRAMESET_5E
+    const BATTLEANIMFRAMESET_5F
+    const BATTLEANIMFRAMESET_60
+    const BATTLEANIMFRAMESET_61
+    const BATTLEANIMFRAMESET_62
+    const BATTLEANIMFRAMESET_63
+    const BATTLEANIMFRAMESET_64
+    const BATTLEANIMFRAMESET_65
+    const BATTLEANIMFRAMESET_66
+    const BATTLEANIMFRAMESET_67
+    const BATTLEANIMFRAMESET_68
+    const BATTLEANIMFRAMESET_69
+    const BATTLEANIMFRAMESET_6A
+    const BATTLEANIMFRAMESET_6B
+    const BATTLEANIMFRAMESET_6C
+    const BATTLEANIMFRAMESET_6D
+    const BATTLEANIMFRAMESET_6E
+    const BATTLEANIMFRAMESET_6F
+    const BATTLEANIMFRAMESET_70
+    const BATTLEANIMFRAMESET_71
+    const BATTLEANIMFRAMESET_72
+    const BATTLEANIMFRAMESET_73
+    const BATTLEANIMFRAMESET_74
+    const BATTLEANIMFRAMESET_75
+    const BATTLEANIMFRAMESET_76
+    const BATTLEANIMFRAMESET_77
+    const BATTLEANIMFRAMESET_78
+    const BATTLEANIMFRAMESET_79
+    const BATTLEANIMFRAMESET_7A
+    const BATTLEANIMFRAMESET_7B
+    const BATTLEANIMFRAMESET_7C
+    const BATTLEANIMFRAMESET_7D
+    const BATTLEANIMFRAMESET_7E
+    const BATTLEANIMFRAMESET_7F
+    const BATTLEANIMFRAMESET_80
+    const BATTLEANIMFRAMESET_81
+    const BATTLEANIMFRAMESET_82
+    const BATTLEANIMFRAMESET_83
+    const BATTLEANIMFRAMESET_84
+    const BATTLEANIMFRAMESET_85
+    const BATTLEANIMFRAMESET_86
+    const BATTLEANIMFRAMESET_87
+    const BATTLEANIMFRAMESET_88
+    const BATTLEANIMFRAMESET_89
+    const BATTLEANIMFRAMESET_8A
+    const BATTLEANIMFRAMESET_8B
+    const BATTLEANIMFRAMESET_8C
+    const BATTLEANIMFRAMESET_8D
+    const BATTLEANIMFRAMESET_8E
+    const BATTLEANIMFRAMESET_8F
+    const BATTLEANIMFRAMESET_90
+    const BATTLEANIMFRAMESET_91
+    const BATTLEANIMFRAMESET_92
+    const BATTLEANIMFRAMESET_93
+    const BATTLEANIMFRAMESET_94
+    const BATTLEANIMFRAMESET_95
+    const BATTLEANIMFRAMESET_96
+    const BATTLEANIMFRAMESET_97
+    const BATTLEANIMFRAMESET_98
+    const BATTLEANIMFRAMESET_99
+    const BATTLEANIMFRAMESET_9A
+    const BATTLEANIMFRAMESET_9B
+    const BATTLEANIMFRAMESET_9C
+    const BATTLEANIMFRAMESET_9D
+    const BATTLEANIMFRAMESET_9E
+    const BATTLEANIMFRAMESET_9F
+    const BATTLEANIMFRAMESET_A0
+    const BATTLEANIMFRAMESET_A1
+    const BATTLEANIMFRAMESET_A2
+    const BATTLEANIMFRAMESET_A3
+    const BATTLEANIMFRAMESET_A4
+    const BATTLEANIMFRAMESET_A5
+    const BATTLEANIMFRAMESET_A6
+    const BATTLEANIMFRAMESET_A7
+    const BATTLEANIMFRAMESET_A8
+    const BATTLEANIMFRAMESET_A9
+    const BATTLEANIMFRAMESET_AA
+    const BATTLEANIMFRAMESET_AB
+    const BATTLEANIMFRAMESET_AC
+    const BATTLEANIMFRAMESET_AD
+    const BATTLEANIMFRAMESET_AE
+    const BATTLEANIMFRAMESET_AF
+    const BATTLEANIMFRAMESET_B0
+    const BATTLEANIMFRAMESET_B1
+    const BATTLEANIMFRAMESET_B2
+    const BATTLEANIMFRAMESET_B3
+    const BATTLEANIMFRAMESET_B4
+    const BATTLEANIMFRAMESET_B5
+    const BATTLEANIMFRAMESET_B6
+    const BATTLEANIMFRAMESET_B7
+    const BATTLEANIMFRAMESET_B8
 
-ANIM_BG_PSYCHIC EQU $29
+	const_def
+	const BATTLEANIMOAMSET_00
+	const BATTLEANIMOAMSET_01
+	const BATTLEANIMOAMSET_02
+	const BATTLEANIMOAMSET_03
+	const BATTLEANIMOAMSET_04
+	const BATTLEANIMOAMSET_05
+	const BATTLEANIMOAMSET_06
+	const BATTLEANIMOAMSET_07
+	const BATTLEANIMOAMSET_08
+	const BATTLEANIMOAMSET_09
+	const BATTLEANIMOAMSET_0A
+	const BATTLEANIMOAMSET_0B
+	const BATTLEANIMOAMSET_0C
+	const BATTLEANIMOAMSET_0D
+	const BATTLEANIMOAMSET_0E
+	const BATTLEANIMOAMSET_0F
+	const BATTLEANIMOAMSET_10
+	const BATTLEANIMOAMSET_11
+	const BATTLEANIMOAMSET_12
+	const BATTLEANIMOAMSET_13
+	const BATTLEANIMOAMSET_14
+	const BATTLEANIMOAMSET_15
+	const BATTLEANIMOAMSET_16
+	const BATTLEANIMOAMSET_17
+	const BATTLEANIMOAMSET_18
+	const BATTLEANIMOAMSET_19
+	const BATTLEANIMOAMSET_1A
+	const BATTLEANIMOAMSET_1B
+	const BATTLEANIMOAMSET_1C
+	const BATTLEANIMOAMSET_1D
+	const BATTLEANIMOAMSET_1E
+	const BATTLEANIMOAMSET_1F
+	const BATTLEANIMOAMSET_20
+	const BATTLEANIMOAMSET_21
+	const BATTLEANIMOAMSET_22
+	const BATTLEANIMOAMSET_23
+	const BATTLEANIMOAMSET_24
+	const BATTLEANIMOAMSET_25
+	const BATTLEANIMOAMSET_26
+	const BATTLEANIMOAMSET_27
+	const BATTLEANIMOAMSET_28
+	const BATTLEANIMOAMSET_29
+	const BATTLEANIMOAMSET_2A
+	const BATTLEANIMOAMSET_2B
+	const BATTLEANIMOAMSET_2C
+	const BATTLEANIMOAMSET_2D
+	const BATTLEANIMOAMSET_2E
+	const BATTLEANIMOAMSET_2F
+	const BATTLEANIMOAMSET_30
+	const BATTLEANIMOAMSET_31
+	const BATTLEANIMOAMSET_32
+	const BATTLEANIMOAMSET_33
+	const BATTLEANIMOAMSET_34
+	const BATTLEANIMOAMSET_35
+	const BATTLEANIMOAMSET_36
+	const BATTLEANIMOAMSET_37
+	const BATTLEANIMOAMSET_38
+	const BATTLEANIMOAMSET_39
+	const BATTLEANIMOAMSET_3A
+	const BATTLEANIMOAMSET_3B
+	const BATTLEANIMOAMSET_3C
+	const BATTLEANIMOAMSET_3D
+	const BATTLEANIMOAMSET_3E
+	const BATTLEANIMOAMSET_3F
+	const BATTLEANIMOAMSET_40
+	const BATTLEANIMOAMSET_41
+	const BATTLEANIMOAMSET_42
+	const BATTLEANIMOAMSET_43
+	const BATTLEANIMOAMSET_44
+	const BATTLEANIMOAMSET_45
+	const BATTLEANIMOAMSET_46
+	const BATTLEANIMOAMSET_47
+	const BATTLEANIMOAMSET_48
+	const BATTLEANIMOAMSET_49
+	const BATTLEANIMOAMSET_4A
+	const BATTLEANIMOAMSET_4B
+	const BATTLEANIMOAMSET_4C
+	const BATTLEANIMOAMSET_4D
+	const BATTLEANIMOAMSET_4E
+	const BATTLEANIMOAMSET_4F
+	const BATTLEANIMOAMSET_50
+	const BATTLEANIMOAMSET_51
+	const BATTLEANIMOAMSET_52
+	const BATTLEANIMOAMSET_53
+	const BATTLEANIMOAMSET_54
+	const BATTLEANIMOAMSET_55
+	const BATTLEANIMOAMSET_56
+	const BATTLEANIMOAMSET_57
+	const BATTLEANIMOAMSET_58
+	const BATTLEANIMOAMSET_59
+	const BATTLEANIMOAMSET_5A
+	const BATTLEANIMOAMSET_5B
+	const BATTLEANIMOAMSET_5C
+	const BATTLEANIMOAMSET_5D
+	const BATTLEANIMOAMSET_5E
+	const BATTLEANIMOAMSET_5F
+	const BATTLEANIMOAMSET_60
+	const BATTLEANIMOAMSET_61
+	const BATTLEANIMOAMSET_62
+	const BATTLEANIMOAMSET_63
+	const BATTLEANIMOAMSET_64
+	const BATTLEANIMOAMSET_65
+	const BATTLEANIMOAMSET_66
+	const BATTLEANIMOAMSET_67
+	const BATTLEANIMOAMSET_68
+	const BATTLEANIMOAMSET_69
+	const BATTLEANIMOAMSET_6A
+	const BATTLEANIMOAMSET_6B
+	const BATTLEANIMOAMSET_6C
+	const BATTLEANIMOAMSET_6D
+	const BATTLEANIMOAMSET_6E
+	const BATTLEANIMOAMSET_6F
+	const BATTLEANIMOAMSET_70
+	const BATTLEANIMOAMSET_71
+	const BATTLEANIMOAMSET_72
+	const BATTLEANIMOAMSET_73
+	const BATTLEANIMOAMSET_74
+	const BATTLEANIMOAMSET_75
+	const BATTLEANIMOAMSET_76
+	const BATTLEANIMOAMSET_77
+	const BATTLEANIMOAMSET_78
+	const BATTLEANIMOAMSET_79
+	const BATTLEANIMOAMSET_7A
+	const BATTLEANIMOAMSET_7B
+	const BATTLEANIMOAMSET_7C
+	const BATTLEANIMOAMSET_7D
+	const BATTLEANIMOAMSET_7E
+	const BATTLEANIMOAMSET_7F
+	const BATTLEANIMOAMSET_80
+	const BATTLEANIMOAMSET_81
+	const BATTLEANIMOAMSET_82
+	const BATTLEANIMOAMSET_83
+	const BATTLEANIMOAMSET_84
+	const BATTLEANIMOAMSET_85
+	const BATTLEANIMOAMSET_86
+	const BATTLEANIMOAMSET_87
+	const BATTLEANIMOAMSET_88
+	const BATTLEANIMOAMSET_89
+	const BATTLEANIMOAMSET_8A
+	const BATTLEANIMOAMSET_8B
+	const BATTLEANIMOAMSET_8C
+	const BATTLEANIMOAMSET_8D
+	const BATTLEANIMOAMSET_8E
+	const BATTLEANIMOAMSET_8F
+	const BATTLEANIMOAMSET_90
+	const BATTLEANIMOAMSET_91
+	const BATTLEANIMOAMSET_92
+	const BATTLEANIMOAMSET_93
+	const BATTLEANIMOAMSET_94
+	const BATTLEANIMOAMSET_95
+	const BATTLEANIMOAMSET_96
+	const BATTLEANIMOAMSET_97
+	const BATTLEANIMOAMSET_98
+	const BATTLEANIMOAMSET_99
+	const BATTLEANIMOAMSET_9A
+	const BATTLEANIMOAMSET_9B
+	const BATTLEANIMOAMSET_9C
+	const BATTLEANIMOAMSET_9D
+	const BATTLEANIMOAMSET_9E
+	const BATTLEANIMOAMSET_9F
+	const BATTLEANIMOAMSET_A0
+	const BATTLEANIMOAMSET_A1
+	const BATTLEANIMOAMSET_A2
+	const BATTLEANIMOAMSET_A3
+	const BATTLEANIMOAMSET_A4
+	const BATTLEANIMOAMSET_A5
+	const BATTLEANIMOAMSET_A6
+	const BATTLEANIMOAMSET_A7
+	const BATTLEANIMOAMSET_A8
+	const BATTLEANIMOAMSET_A9
+	const BATTLEANIMOAMSET_AA
+	const BATTLEANIMOAMSET_AB
+	const BATTLEANIMOAMSET_AC
+	const BATTLEANIMOAMSET_AD
+	const BATTLEANIMOAMSET_AE
+	const BATTLEANIMOAMSET_AF
+	const BATTLEANIMOAMSET_B0
+	const BATTLEANIMOAMSET_B1
+	const BATTLEANIMOAMSET_B2
+	const BATTLEANIMOAMSET_B3
+	const BATTLEANIMOAMSET_B4
+	const BATTLEANIMOAMSET_B5
+	const BATTLEANIMOAMSET_B6
+	const BATTLEANIMOAMSET_B7
+	const BATTLEANIMOAMSET_B8
+	const BATTLEANIMOAMSET_B9
+	const BATTLEANIMOAMSET_BA
+	const BATTLEANIMOAMSET_BB
+	const BATTLEANIMOAMSET_BC
+	const BATTLEANIMOAMSET_BD
+	const BATTLEANIMOAMSET_BE
+	const BATTLEANIMOAMSET_BF
+	const BATTLEANIMOAMSET_C0
+	const BATTLEANIMOAMSET_C1
+	const BATTLEANIMOAMSET_C2
+	const BATTLEANIMOAMSET_C3
+	const BATTLEANIMOAMSET_C4
+	const BATTLEANIMOAMSET_C5
+	const BATTLEANIMOAMSET_C6
+	const BATTLEANIMOAMSET_C7
+	const BATTLEANIMOAMSET_C8
+	const BATTLEANIMOAMSET_C9
+	const BATTLEANIMOAMSET_CA
+	const BATTLEANIMOAMSET_CB
+	const BATTLEANIMOAMSET_CC
+	const BATTLEANIMOAMSET_CD
+	const BATTLEANIMOAMSET_CE
+	const BATTLEANIMOAMSET_CF
+	const BATTLEANIMOAMSET_D0
+	const BATTLEANIMOAMSET_D1
+	const BATTLEANIMOAMSET_D2
+	const BATTLEANIMOAMSET_D3
+	const BATTLEANIMOAMSET_D4
+	const BATTLEANIMOAMSET_D5
+	const BATTLEANIMOAMSET_D6
+	const BATTLEANIMOAMSET_D7
 
-ANIM_BG_VIBRATE_MON EQU $33
-ANIM_BG_WOBBLE_MON EQU $34
+const_value SET 1
+	const ANIM_BG_FLASH_INVERTED
+	const ANIM_BG_FLASH_WHITE
+	const ANIM_BG_WHITE_HUES
+	const ANIM_BG_BLACK_HUES
+	const ANIM_BG_ALTERNATE_HUES
+	const ANIM_BG_06
+	const ANIM_BG_07
+	const ANIM_BG_08
+	const ANIM_BG_HIDE_MON
+	const ANIM_BG_SHOW_MON
+	const ANIM_BG_ENTER_MON
+	const ANIM_BG_RETURN_MON
+	const ANIM_BG_SURF
+	const ANIM_BG_WHIRLPOOL
+	const ANIM_BG_TELEPORT
+	const ANIM_BG_NIGHT_SHADE
+	const ANIM_BG_FEET_FOLLOW
+	const ANIM_BG_HEAD_FOLLOW
+	const ANIM_BG_DOUBLE_TEAM
+	const ANIM_BG_ACID_ARMOR
+	const ANIM_BG_RAPID_FLASH
+	const ANIM_BG_16
+	const ANIM_BG_17
+	const ANIM_BG_18
+	const ANIM_BG_19
+	const ANIM_BG_1A
+	const ANIM_BG_1B
+	const ANIM_BG_1C
+	const ANIM_BG_1D
+	const ANIM_BG_1E
+	const ANIM_BG_1F
+	const ANIM_BG_20
+	const ANIM_BG_21
+	const ANIM_BG_BOUNCE_DOWN
+	const ANIM_BG_DIG
+	const ANIM_BG_TACKLE
+	const ANIM_BG_25
+	const ANIM_BG_26
+	const ANIM_BG_27
+	const ANIM_BG_28
+	const ANIM_BG_PSYCHIC
+	const ANIM_BG_2A
+	const ANIM_BG_2B
+	const ANIM_BG_2C
+	const ANIM_BG_2D
+	const ANIM_BG_2E
+	const ANIM_BG_2F
+	const ANIM_BG_30
+	const ANIM_BG_31
+	const ANIM_BG_32
+	const ANIM_BG_VIBRATE_MON
+	const ANIM_BG_WOBBLE_MON
+	const ANIM_BG_35
 
 	const_def
 	const ANIM_MON_SLOW    ; 0
@@ -48,3 +767,9 @@ ANIM_BG_WOBBLE_MON EQU $34
 	const ANIM_MON_UNUSED  ; 6
 	const ANIM_MON_EGG1    ; 7
 	const ANIM_MON_EGG2    ; 8
+
+	const_def
+	const BG_EFFECT_STRUCT_FUNCTION
+	const BG_EFFECT_STRUCT_JT_INDEX
+	const BG_EFFECT_STRUCT_BATTLE_TURN
+	const BG_EFFECT_STRUCT_03
diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm
new file mode 100755
index 000000000..eff9dab84
--- /dev/null
+++ b/constants/audio_constants.asm
@@ -0,0 +1,62 @@
+
+
+; pitch
+	const_def
+	const __
+	const C_
+	const C#
+	const D_
+	const D#
+	const E_
+	const F_
+	const F#
+	const G_
+	const G#
+	const A_
+	const A#
+	const B_
+
+; channel
+	const_def
+	const CHAN1
+	const CHAN2
+	const CHAN3
+	const CHAN4
+NUM_MUSIC_CHANS EQU const_value
+NUM_NOISE_CHANS EQU const_value
+	const CHAN5
+	const CHAN6
+	const CHAN7
+	const CHAN8
+NUM_CHANNELS EQU const_value
+
+; Flags1
+SOUND_CHANNEL_ON EQU 0
+SOUND_SUBROUTINE EQU 1
+SOUND_LOOPING EQU 2
+SOUND_SFX EQU 3
+SOUND_NOISE EQU 4
+SOUND_REST EQU 5
+
+; Flags2
+
+SOUND_VIBRATO EQU 0
+SOUND_UNKN_09 EQU 1
+SOUND_DUTY EQU 2
+SOUND_UNKN_0B EQU 3
+SOUND_CRY_PITCH EQU 4
+SOUND_UNKN_0D EQU 5
+SOUND_UNKN_0E EQU 6
+SOUND_UNKN_0F EQU 7
+
+; Flags3
+SOUND_VIBRATO_DIR EQU 0
+SOUND_UNKN_11 EQU 1
+
+; NoteFlags
+NOTE_UNKN_0 EQU 0
+NOTE_UNKN_1 EQU 1
+NOTE_UNKN_3 EQU 3
+NOTE_UNKN_4 EQU 4
+NOTE_REST EQU 5
+NOTE_UNKN_6 EQU 6
diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm
index 49311f35d..1e5b0d625 100755
--- a/constants/battle_tower_constants.asm
+++ b/constants/battle_tower_constants.asm
@@ -1,33 +1,39 @@
 	const_def
-	const BATTLE_TOWER_ACTION_00
-	const BATTLE_TOWER_ACTION_01
-	const BATTLE_TOWER_ACTION_02
-	const BATTLE_TOWER_ACTION_03
-	const BATTLE_TOWER_ACTION_04
-	const BATTLE_TOWER_ACTION_05
-	const BATTLE_TOWER_ACTION_06
-	const BATTLE_TOWER_ACTION_07
-	const BATTLE_TOWER_ACTION_08
-	const BATTLE_TOWER_ACTION_09
-	const BATTLE_TOWER_ACTION_0A
-	const BATTLE_TOWER_ACTION_0B
-	const BATTLE_TOWER_ACTION_0C
-	const BATTLE_TOWER_ACTION_0D
-	const BATTLE_TOWER_ACTION_0E
-	const BATTLE_TOWER_ACTION_0F
-	const BATTLE_TOWER_ACTION_10
-	const BATTLE_TOWER_ACTION_11
-	const BATTLE_TOWER_ACTION_12
-	const BATTLE_TOWER_ACTION_13
-	const BATTLE_TOWER_ACTION_14
-	const BATTLE_TOWER_ACTION_15
-	const BATTLE_TOWER_ACTION_16
-	const BATTLE_TOWER_ACTION_17
-	const BATTLE_TOWER_ACTION_18
-	const BATTLE_TOWER_ACTION_19
-	const BATTLE_TOWER_ACTION_1A
-	const BATTLE_TOWER_ACTION_1B
-	const BATTLE_TOWER_ACTION_1C
-	const BATTLE_TOWER_ACTION_1D
-	const BATTLE_TOWER_ACTION_1E
-	const BATTLE_TOWER_ACTION_1F
+	const BATTLETOWERACTION_00
+	const BATTLETOWERACTION_01
+	const BATTLETOWERACTION_02
+	const BATTLETOWERACTION_SAVE_AND_QUIT
+	const BATTLETOWERACTION_CHALLENGECANCELED
+	const BATTLETOWERACTION_05
+	const BATTLETOWERACTION_06 ; reset stuff in SRAM bank 5
+	const BATTLETOWERACTION_SAVELEVELGROUP
+	const BATTLETOWERACTION_LOADLEVELGROUP
+	const BATTLETOWERACTION_CHECKSAVEFILEISYOURS
+	const BATTLETOWERACTION_0A
+	const BATTLETOWERACTION_CHECKMOBILEEVENT
+	const BATTLETOWERACTION_0C ; more time stuff in SRAM bank 5
+	const BATTLETOWERACTION_0D ; more time stuff in SRAM bank 5
+	const BATTLETOWERACTION_EGGTICKET ; egg ticket
+	const BATTLETOWERACTION_0F ; check w3_d090
+	const BATTLETOWERACTION_10 ; dw based on 5:a800
+	const BATTLETOWERACTION_11 ; store 0 in 5:aa8d
+	const BATTLETOWERACTION_12 ; store 1 in 5:aa8d
+	const BATTLETOWERACTION_13 ; check 5:aa8d
+	const BATTLETOWERACTION_14 ; if save file is yours: bit 0, [sbe4f]
+	const BATTLETOWERACTION_15 ; set 0, [sbe4f]
+	const BATTLETOWERACTION_16 ; update time in SRAM bank 5
+	const BATTLETOWERACTION_17 ; check time in SRAM bank 5
+	const BATTLETOWERACTION_18 ; level check
+	const BATTLETOWERACTION_19 ; ubers check
+	const BATTLETOWERACTION_RESETDATA ; clear data
+	const BATTLETOWERACTION_GIVEREWARD ; give reward
+	const BATTLETOWERACTION_1C ; set won challenge
+	const BATTLETOWERACTION_1D ; set received reward
+	const BATTLETOWERACTION_CHOOSEREWARD ; save options
+	const BATTLETOWERACTION_SAVEOPTIONS
+
+BATTLETOWER_NO_CHALLENGE         EQU 0
+BATTLETOWER_SAVED_AND_LEFT       EQU 1
+BATTLETOWER_CHALLENGE_IN_PROGESS EQU 2
+BATTLETOWER_WON_CHALLENGE        EQU 3
+BATTLETOWER_RECEIVED_REWARD      EQU 4
diff --git a/constants/cgb_constants.asm b/constants/cgb_constants.asm
index 5fb29ae84..028cc71d7 100755
--- a/constants/cgb_constants.asm
+++ b/constants/cgb_constants.asm
@@ -1,14 +1,14 @@
 	const_def
-	const SCGB_00
-	const SCGB_01
-	const SCGB_02
-	const SCGB_03
+	const SCGB_BATTLE_GRAYSCALE
+	const SCGB_BATTLE_COLORS
+	const SCGB_POKEGEAR_PALS
+	const SCGB_STATS_SCREEN_HP_PALS
 	const SCGB_04
-	const SCGB_05
+	const SCGB_SLOT_MACHINE
 	const SCGB_06
 	const SCGB_07
 	const SCGB_08
-	const SCGB_09
+	const SCGB_MAPPALS
 	const SCGB_0A
 	const SCGB_0B
 	const SCGB_0C
@@ -19,17 +19,17 @@
 	const SCGB_11
 	const SCGB_12
 	const SCGB_13
-	const SCGB_14
-	const SCGB_15
+	const SCGB_PACKPALS
+	const SCGB_TRAINER_CARD
 	const SCGB_16
 	const SCGB_17
 	const SCGB_18
 	const SCGB_19
 	const SCGB_1A
 	const SCGB_1B
-	const SCGB_1C
+	const SCGB_FRONTPICPALS
 	const SCGB_1D
 	const SCGB_1E
 
-SCGB_FC  EQU -4
+SCGB_PARTY_MENU_HP_PALS  EQU -4
 SCGB_RAM EQU -1
diff --git a/constants/cry_constants.asm b/constants/cry_constants.asm
new file mode 100755
index 000000000..da40877cc
--- /dev/null
+++ b/constants/cry_constants.asm
@@ -0,0 +1,73 @@
+	const_def
+
+; gen 1
+	const CRY_NIDORAN_M
+	const CRY_NIDORAN_F
+	const CRY_SLOWPOKE
+	const CRY_KANGASKHAN
+	const CRY_CHARMANDER
+	const CRY_GRIMER
+	const CRY_VOLTORB
+	const CRY_MUK
+	const CRY_ODDISH
+	const CRY_RAICHU
+	const CRY_NIDOQUEEN
+	const CRY_DIGLETT
+	const CRY_SEEL
+	const CRY_DROWZEE
+	const CRY_PIDGEY
+	const CRY_BULBASAUR
+	const CRY_SPEAROW
+	const CRY_RHYDON
+	const CRY_GOLEM
+	const CRY_BLASTOISE
+	const CRY_PIDGEOTTO
+	const CRY_WEEDLE
+	const CRY_CATERPIE
+	const CRY_EKANS
+	const CRY_FEAROW
+	const CRY_CLEFAIRY
+	const CRY_VENONAT
+	const CRY_LAPRAS
+	const CRY_METAPOD
+	const CRY_SQUIRTLE
+	const CRY_PARAS
+	const CRY_GROWLITHE
+	const CRY_KRABBY
+	const CRY_PSYDUCK
+	const CRY_RATTATA
+	const CRY_VILEPLUME
+	const CRY_VULPIX
+	const CRY_WEEPINBELL
+
+; gen 2
+	const CRY_MARILL
+	const CRY_SPINARAK
+	const CRY_TOGEPI
+	const CRY_GIRAFARIG
+	const CRY_RAIKOU
+	const CRY_MAREEP
+	const CRY_TOGETIC
+	const CRY_HOOTHOOT
+	const CRY_SENTRET
+	const CRY_SLOWKING
+	const CRY_CYNDAQUIL
+	const CRY_CHIKORITA
+	const CRY_TOTODILE
+	const CRY_GLIGAR
+	const CRY_CLEFFA
+	const CRY_SLUGMA
+	const CRY_LEDYBA
+	const CRY_ENTEI
+	const CRY_WOOPER
+	const CRY_MANTINE
+	const CRY_TYPHLOSION
+	const CRY_NATU
+	const CRY_TEDDIURSA
+	const CRY_SUNFLORA
+	const CRY_AMPHAROS
+	const CRY_MAGCARGO
+	const CRY_PICHU
+	const CRY_AIPOM
+	const CRY_DUNSPARCE
+	const CRY_DONPHAN
diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm
index cb5b6d00a..22cf1e670 100644
--- a/constants/deco_constants.asm
+++ b/constants/deco_constants.asm
@@ -51,59 +51,71 @@ const_value = 1
 	const SET_UP_ORNAMENT
 	const PUT_AWAY_ORNAMENT
 
+deco: MACRO
+	const DECO_\1
+	enum DECOFLAG_\1
+endm
+
 const_value = 1
-	const DECO_BEDS
-	const DECO_FEATHERY_BED ; 2
-	const DECO_PINK_BED ; 3
-	const DECO_POLKADOT_BED ; 4
-	const DECO_PIKACHU_BED ; 5
-	const DECO_CARPETS
-	const DECO_RED_CARPET ; 7
-	const DECO_BLUE_CARPET ; 8
-	const DECO_YELLOW_CARPET ; 9
-	const DECO_GREEN_CARPET ; a
-	const DECO_0B
-	const DECO_MAGNAPLANT ; c
-	const DECO_TROPICPLANT ; d
-	const DECO_JUMBOPLANT ; e
-	const DECO_POSTERS
-	const DECO_TOWN_MAP ; 10
-	const DECO_PIKACHU_POSTER ; 11
-	const DECO_CLEFAIRY_POSTER ; 12
-	const DECO_JIGGLYPUFF_POSTER ; 13
-	const DECO_CONSOLES
-	const DECO_FAMICOM ; 15
-	const DECO_SNES ; 16
-	const DECO_N64 ; 17
-	const DECO_VIRTUAL_BOY ; 18
-	const DECO_BIG_DOLLS
-	const DECO_BIG_SNORLAX_DOLL ; 1a
-	const DECO_BIG_ONIX_DOLL ; 1b
-	const DECO_BIG_LAPRAS_DOLL ; 1c
-	const DECO_DOLLS
-	const DECO_PIKACHU_DOLL ; 1e
-	const DECO_SURF_PIKACHU_DOLL ; 1f
-	const DECO_CLEFAIRY_DOLL ; 20
-	const DECO_JIGGLYPUFF_DOLL ; 21
-	const DECO_BULBASAUR_DOLL ; 22
-	const DECO_CHARMANDER_DOLL ; 23
-	const DECO_SQUIRTLE_DOLL ; 24
-	const DECO_POLIWAG_DOLL ; 25
-	const DECO_DIGLETT_DOLL ; 26
-	const DECO_STARMIE_DOLL ; 27
-	const DECO_MAGIKARP_DOLL ; 28
-	const DECO_ODDISH_DOLL ; 29
-	const DECO_GENGAR_DOLL ; 2a
-	const DECO_SHELLDER_DOLL ; 2b
-	const DECO_GRIMER_DOLL ; 2c
-	const DECO_VOLTORB_DOLL ; 2d
-	const DECO_WEEDLE_DOLL ; 2e
-	const DECO_UNOWN_DOLL ; 2f
-	const DECO_GEODUDE_DOLL ; 30
-	const DECO_MACHOP_DOLL ; 31
-	const DECO_TENTACOOL_DOLL ; 32
-	const DECO_GOLD_TROPHY_DOLL ; 33
-	const DECO_SILVER_TROPHY_DOLL ; 34
+__enum__ = 0
+	const BEDS
+	deco  FEATHERY_BED ; 2 (0)
+	deco  PINK_BED ; 3 (1)
+	deco  POLKADOT_BED ; 4 (2)
+	deco  PIKACHU_BED ; 5 (3)
+
+	const CARPETS
+	deco  RED_CARPET ; 7 (4)
+	deco  BLUE_CARPET ; 8 (5)
+	deco  YELLOW_CARPET ; 9 (6)
+	deco  GREEN_CARPET ; a (7)
+
+	const PLANTS
+	deco  MAGNAPLANT ; c (8)
+	deco  TROPICPLANT ; d (9)
+	deco  JUMBOPLANT ; e (a)
+
+	const POSTERS
+	deco  TOWN_MAP ; 10 (b)
+	deco  PIKACHU_POSTER ; 11 (c)
+	deco  CLEFAIRY_POSTER ; 12 (d)
+	deco  JIGGLYPUFF_POSTER ; 13(e)
+
+	const CONSOLES
+	deco  FAMICOM ; 15 (f)
+	deco  SNES ; 16 (10)
+	deco  N64 ; 17 (11)
+	deco  VIRTUAL_BOY ; 18 (12)
+
+	const BIG_DOLLS
+	deco  BIG_SNORLAX_DOLL ; 1a (13)
+	deco  BIG_ONIX_DOLL ; 1b (14)
+	deco  BIG_LAPRAS_DOLL ; 1c (15)
+
+	const DOLLS
+	deco  PIKACHU_DOLL ; 1e (16)
+	deco  SURF_PIKACHU_DOLL ; 1f (17)
+	deco  CLEFAIRY_DOLL ; 20 (18)
+	deco  JIGGLYPUFF_DOLL ; 21 (19)
+	deco  BULBASAUR_DOLL ; 22 (1a)
+	deco  CHARMANDER_DOLL ; 23 (1b)
+	deco  SQUIRTLE_DOLL ; 24 (1c)
+	deco  POLIWAG_DOLL ; 25 (1d)
+	deco  DIGLETT_DOLL ; 26 (1e)
+	deco  STARMIE_DOLL ; 27 (1f)
+	deco  MAGIKARP_DOLL ; 28 (20)
+	deco  ODDISH_DOLL ; 29 (21)
+	deco  GENGAR_DOLL ; 2a (22)
+	deco  SHELLDER_DOLL ; 2b (23)
+	deco  GRIMER_DOLL ; 2c (24)
+	deco  VOLTORB_DOLL ; 2d (25)
+	deco  WEEDLE_DOLL ; 2e (26)
+	deco  UNOWN_DOLL ; 2f (27)
+	deco  GEODUDE_DOLL ; 30 (28)
+	deco  MACHOP_DOLL ; 31 (29)
+	deco  TENTACOOL_DOLL ; 32 (2a)
+	deco  GOLD_TROPHY_DOLL ; 33 (2b)
+	deco  SILVER_TROPHY_DOLL ; 34 (2c)
 
 NUM_NON_TROPHY_DECOS EQU $2b
 NUM_DECOS EQU $2d
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm
index fc91be58c..31a038196 100644
--- a/constants/engine_flags.asm
+++ b/constants/engine_flags.asm
@@ -5,7 +5,7 @@
 	const ENGINE_PHONE_CARD
 	const ENGINE_EXPN_CARD
 	const ENGINE_POKEGEAR
-	const ENGINE_DAYCARE_MONS_ARE_COMPATIBLE
+	const ENGINE_DAYCARE_MAN_HAS_EGG
 	const ENGINE_DAYCARE_MAN_HAS_MON
 	const ENGINE_DAYCARE_LADY_HAS_MON
 	const ENGINE_MOM_SAVING_MONEY
@@ -18,7 +18,7 @@
 	const ENGINE_CREDITS_SKIP
 	const ENGINE_BUG_CONTEST_ON ; 10
 	const ENGINE_BUG_CONTEST_TIMER
-	const ENGINE_12
+	const ENGINE_SAFARI_ZONE
 	const ENGINE_ROCKETS_IN_RADIO_TOWER
 	const ENGINE_BIKE_SHOP_CALL_ENABLED
 	const ENGINE_GIVE_POKERUS
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index b0b1ad588..ede44c546 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -659,7 +659,7 @@ EMOTE_OBJECT EQU 7
 
 	const_def
 	const PERSONTYPE_SCRIPT
-	const PERSONTYPE_ITEMFRAGMENT
+	const PERSONTYPE_ITEMBALL
 	const PERSONTYPE_TRAINER
 	const PERSONTYPE_3
 	const PERSONTYPE_4
diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm
index 194257996..f739830f0 100644
--- a/constants/map_setup_constants.asm
+++ b/constants/map_setup_constants.asm
@@ -15,50 +15,50 @@ const_value SET $f1
 ; Command descriptions from Condensation water's scripting compendium.	const_def
 	const_def
 
-	const map_lcd_on
-	const map_lcd_off
-	const map_sound_off
-	const map_music
-	const map_start_music
-	const map_fade_music
-	const map_fade
-	const map_bike_music
-	const map_music_force
-	const map_max_volume
-	const map_load_blocks
-	const map_connection_blocks
-	const map_save_screen
-	const map_buffer_screen
-	const map_load_graphics
-	const map_load_tileset_header
-	const map_time_of_day
-	const map_palettes
-	const map_wildmons
-	const map_sprites
-	const map_change_callback
-	const map_start_callback
-	const map_load_objects
-	const map_load_spawn
-	const map_load_connection
-	const map_load_warp
-	const map_attributes
-	const map_attributes_2
-	const map_clear_bg_palettes
-	const map_fade_out_palettes
-	const map_fade_in_palettes
-	const map_anchor_screen
-	const map_warp_face
-	const map_face_down
-	const map_spawn_coord
-	const map_player_coord
-	const map_prolong_sprites
-	const map_delay_sprites
-	const map_update_roam
-	const map_keep_roam
-	const map_fade_out_music
-	const map_animations_on
-	const map_animations_off
-	const map_keep_palettes
-	const map_text_scroll_off
-	const map_stop_script
-map_end_setup_script EQU -1
+	const map_lcd_on              ; 00
+	const map_lcd_off             ; 01
+	const map_sound_off           ; 02
+	const map_music               ; 03
+	const map_start_music         ; 04
+	const map_fade_music          ; 05
+	const map_fade                ; 06
+	const map_bike_music          ; 07
+	const map_music_force         ; 08
+	const map_max_volume          ; 09
+	const map_load_blocks         ; 0a
+	const map_connection_blocks   ; 0b
+	const map_save_screen         ; 0c
+	const map_buffer_screen       ; 0d
+	const map_load_graphics       ; 0e
+	const map_load_tileset_header ; 0f
+	const map_time_of_day         ; 10
+	const map_palettes            ; 11
+	const map_wildmons            ; 12
+	const map_sprites             ; 13
+	const map_change_callback     ; 14
+	const map_start_callback      ; 15
+	const map_load_objects        ; 16
+	const map_load_spawn          ; 17
+	const map_load_connection     ; 18
+	const map_load_warp           ; 19
+	const map_attributes          ; 1a
+	const map_attributes_2        ; 1b
+	const map_clear_bg_palettes   ; 1c
+	const map_fade_out_palettes   ; 1d
+	const map_fade_in_palettes    ; 1e
+	const map_anchor_screen       ; 1f
+	const map_warp_face           ; 20
+	const map_face_down           ; 21
+	const map_spawn_coord         ; 22
+	const map_player_coord        ; 23
+	const map_prolong_sprites     ; 24
+	const map_delay_sprites       ; 25
+	const map_update_roam         ; 26
+	const map_keep_roam           ; 27
+	const map_fade_out_music      ; 28
+	const map_animations_on       ; 29
+	const map_animations_off      ; 2a
+	const map_keep_palettes       ; 2b
+	const map_text_scroll_off     ; 2c
+	const map_stop_script         ; 2d
+map_end EQU -1
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
index cf1e9dfae..4787f97ef 100644
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -48,6 +48,9 @@ RESET_FLAG EQU 0
 SET_FLAG   EQU 1
 CHECK_FLAG EQU 2
 
+; Boolean checks
+FALSE EQU 0
+TRUE  EQU 1
 
 ; joypad
 
@@ -90,6 +93,8 @@ SCREEN_HEIGHT_PX EQU SCREEN_HEIGHT * 8
 
 BG_MAP_WIDTH  EQU 32
 BG_MAP_HEIGHT EQU 32
+WMISC_WIDTH   EQU 6 * 4
+WMISC_HEIGHT  EQU 5 * 4
 
 TILE_WIDTH EQU 8
 
@@ -206,89 +211,4 @@ NUM_JOHTO_BADGES EQU const_value
 	const EARTHBADGE
 NUM_KANTO_BADGES EQU const_value
 NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES
-
-	const_def
-	const SPRITE_ANIM_SEQ_00
-	const SPRITE_ANIM_SEQ_01
-	const SPRITE_ANIM_SEQ_02
-	const SPRITE_ANIM_SEQ_03
-	const SPRITE_ANIM_SEQ_04
-	const SPRITE_ANIM_SEQ_05
-	const SPRITE_ANIM_SEQ_06
-	const SPRITE_ANIM_SEQ_07
-	const SPRITE_ANIM_SEQ_08
-	const SPRITE_ANIM_SEQ_09
-	const SPRITE_ANIM_SEQ_0A
-	const SPRITE_ANIM_SEQ_0B
-	const SPRITE_ANIM_SEQ_0C
-	const SPRITE_ANIM_SEQ_0D
-	const SPRITE_ANIM_SEQ_0E
-	const SPRITE_ANIM_SEQ_0F
-	const SPRITE_ANIM_SEQ_10
-	const SPRITE_ANIM_SEQ_11
-	const SPRITE_ANIM_SEQ_12
-	const SPRITE_ANIM_SEQ_13
-	const SPRITE_ANIM_SEQ_14
-	const SPRITE_ANIM_SEQ_15
-	const SPRITE_ANIM_SEQ_16
-	const SPRITE_ANIM_SEQ_17
-	const SPRITE_ANIM_SEQ_18
-	const SPRITE_ANIM_SEQ_19
-	const SPRITE_ANIM_SEQ_1A
-	const SPRITE_ANIM_SEQ_1B
-	const SPRITE_ANIM_SEQ_1C
-	const SPRITE_ANIM_SEQ_1D
-	const SPRITE_ANIM_SEQ_1E
-	const SPRITE_ANIM_SEQ_1F
-	const SPRITE_ANIM_SEQ_20
-	const SPRITE_ANIM_SEQ_21
-	const SPRITE_ANIM_SEQ_22
-
-	const_def
-	const SPRITE_ANIM_INDEX_00
-	const SPRITE_ANIM_INDEX_01
-	const SPRITE_ANIM_INDEX_02
-	const SPRITE_ANIM_INDEX_03
-	const SPRITE_ANIM_INDEX_04
-	const SPRITE_ANIM_INDEX_05
-	const SPRITE_ANIM_INDEX_06
-	const SPRITE_ANIM_INDEX_07
-	const SPRITE_ANIM_INDEX_08
-	const SPRITE_ANIM_INDEX_09
-	const SPRITE_ANIM_INDEX_0A
-	const SPRITE_ANIM_INDEX_0B
-	const SPRITE_ANIM_INDEX_0C
-	const SPRITE_ANIM_INDEX_0D
-	const SPRITE_ANIM_INDEX_0E
-	const SPRITE_ANIM_INDEX_0F
-	const SPRITE_ANIM_INDEX_10
-	const SPRITE_ANIM_INDEX_11
-	const SPRITE_ANIM_INDEX_12
-	const SPRITE_ANIM_INDEX_13
-	const SPRITE_ANIM_INDEX_14
-	const SPRITE_ANIM_INDEX_15
-	const SPRITE_ANIM_INDEX_16
-	const SPRITE_ANIM_INDEX_17
-	const SPRITE_ANIM_INDEX_18
-	const SPRITE_ANIM_INDEX_19
-	const SPRITE_ANIM_INDEX_1A
-	const SPRITE_ANIM_INDEX_1B
-	const SPRITE_ANIM_INDEX_1C
-	const SPRITE_ANIM_INDEX_1D
-	const SPRITE_ANIM_INDEX_1E
-	const SPRITE_ANIM_INDEX_1F
-	const SPRITE_ANIM_INDEX_20
-	const SPRITE_ANIM_INDEX_21
-	const SPRITE_ANIM_INDEX_22
-	const SPRITE_ANIM_INDEX_23
-	const SPRITE_ANIM_INDEX_24
-	const SPRITE_ANIM_INDEX_25
-	const SPRITE_ANIM_INDEX_26
-	const SPRITE_ANIM_INDEX_27
-	const SPRITE_ANIM_INDEX_28
-	const SPRITE_ANIM_INDEX_29
-	const SPRITE_ANIM_INDEX_2A
-	const SPRITE_ANIM_INDEX_2B
-	const SPRITE_ANIM_INDEX_2C
-
 NUM_KANA EQU $2d
diff --git a/constants/move_constants.asm b/constants/move_constants.asm
index e8392b45a..8492c2415 100644
--- a/constants/move_constants.asm
+++ b/constants/move_constants.asm
@@ -287,7 +287,7 @@ const_value SET const_value + -1
 	const ANIM_SHAKE             ; $114
 	const ANIM_HIT_CONFUSION     ; $115
 
-; wcfca uses offsets from ANIM_MISS
+; wNumHits uses offsets from ANIM_MISS
 	const_def
 	const BATTLEANIM_NONE
 	const BATTLEANIM_ENEMY_DAMAGE
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 654459c44..5041f7064 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -291,6 +291,7 @@ MON_SAT                  EQUS "(PartyMon1SpclAtk - PartyMon1)"
 MON_SDF                  EQUS "(PartyMon1SpclDef - PartyMon1)"
 BOXMON_STRUCT_LENGTH     EQUS "(PartyMon1End - PartyMon1)"
 PARTYMON_STRUCT_LENGTH   EQUS "(PartyMon1StatsEnd - PartyMon1)"
+REDMON_STRUCT_LENGTH EQU 44
 
 const_value SET 1
 	const MONMENU_CUT        ; 1
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index 354b86b89..383e9bac2 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -9,21 +9,21 @@
 
 ; egg group constants
 const_value SET 1
-	const MONSTER
-	const AMPHIBIAN
-	const INSECT
-	const AVIAN
-	const FIELD
-	const FAIRY
-	const PLANT
-	const HUMANSHAPE
-	const INVERTEBRATE
-	const INANIMATE
-	const AMORPHOUS
-	const FISH
-	const LADIES_MAN
-	const REPTILE
-	const NO_EGGS
+	const MONSTER      ; 1
+	const AMPHIBIAN    ; 2
+	const INSECT       ; 3
+	const AVIAN        ; 4
+	const FIELD        ; 5
+	const FAIRY        ; 6
+	const PLANT        ; 7
+	const HUMANSHAPE   ; 8
+	const INVERTEBRATE ; 9
+	const INANIMATE    ; a
+	const AMORPHOUS    ; b
+	const FISH         ; c
+	const LADIES_MAN   ; d
+	const REPTILE      ; e
+	const NO_EGGS      ; f
 
 
 ; menu sprites
diff --git a/constants/radio_constants.asm b/constants/radio_constants.asm
index ee9cd6ce6..92aa39adc 100644
--- a/constants/radio_constants.asm
+++ b/constants/radio_constants.asm
@@ -89,6 +89,17 @@
 	const POKEDEX_SHOW_8         ; $57
 
 	const_def
+	const MAPRADIO_POKEMON_CHANNEL
+	const MAPRADIO_OAKS_MON_TALK
+	const MAPRADIO_POKEDEX_SHOW
+	const MAPRADIO_PKMN_MUSIC
+	const MAPRADIO_LUCKY_CHANNEL
+	const MAPRADIO_UNOWN
+	const MAPRADIO_PLACES_PEOPLE
+	const MAPRADIO_LETS_ALL_SING
+	const MAPRADIO_ROCKET
+
+	const_def
 	const BUENA_MON
 	const BUENA_ITEM
 	const BUENA_MOVE
diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index f1e608ab9..b695c4ee9 100644
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -24,7 +24,7 @@ LAST_TALKED EQU -2
 	const VAR_XCOORD           ; 12
 	const VAR_YCOORD           ; 13
 	const VAR_SPECIALPHONECALL ; 14
-	const VAR_15               ; 15
+	const VAR_BT_WIN_STREAK    ; 15
 	const VAR_KURT_APRICORNS   ; 16
 	const VAR_CALLERID         ; 17
 	const VAR_BLUECARDBALANCE  ; 18
diff --git a/constants/sfx_constants.asm b/constants/sfx_constants.asm
index 794b9b593..d8567542e 100644
--- a/constants/sfx_constants.asm
+++ b/constants/sfx_constants.asm
@@ -98,7 +98,7 @@
 	const SFX_UNKNOWN_5F
 	const SFX_UNKNOWN_60
 	const SFX_UNKNOWN_61
-	const SFX_UNKNOWN_62
+	const SFX_SWITCH_POCKETS
 	const SFX_UNKNOWN_63
 	const SFX_BURN
 	const SFX_TITLE_SCREEN_ENTRANCE
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
index c34ac6c28..3d0c3919a 100644
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -269,7 +269,7 @@ MAX_OUTDOOR_SPRITES EQU 23
 
 	const_def
 	const STEP_TYPE_00
-	const STEP_TYPE_STANDING
+	const STEP_TYPE_SLEEP
 	const STEP_TYPE_NPC_WALK
 	const STEP_TYPE_03
 	const STEP_TYPE_04
@@ -287,13 +287,13 @@ MAX_OUTDOOR_SPRITES EQU 23
 	const STEP_TYPE_GOT_BITE
 	const STEP_TYPE_ROCK_SMASH
 	const STEP_TYPE_RETURN_DIG
-	const STEP_TYPE_13
+	const STEP_TYPE_TRACKING_OBJECT
 	const STEP_TYPE_14
 	const STEP_TYPE_15
 	const STEP_TYPE_16
 	const STEP_TYPE_17
 	const STEP_TYPE_18
-	const STEP_TYPE_19
+	const STEP_TYPE_SKYFALL_TOP
 
 	const_def
 	const PERSON_ACTION_00
@@ -347,3 +347,173 @@ MAX_OUTDOOR_SPRITES EQU 23
 	const FACING_1D
 	const FACING_1E
 	const FACING_1F
+
+	const_def
+	const SPRITEANIMSTRUCT_INDEX          ; 0
+	const SPRITEANIMSTRUCT_FRAMESET_ID    ; 1
+	const SPRITEANIMSTRUCT_ANIM_SEQ_ID    ; 2
+	const SPRITEANIMSTRUCT_TILE_ID        ; 3
+	const SPRITEANIMSTRUCT_XCOORD         ; 4
+	const SPRITEANIMSTRUCT_YCOORD         ; 5
+	const SPRITEANIMSTRUCT_XOFFSET        ; 6
+	const SPRITEANIMSTRUCT_YOFFSET        ; 7
+	const SPRITEANIMSTRUCT_DURATION       ; 8
+	const SPRITEANIMSTRUCT_DURATIONOFFSET ; 9
+	const SPRITEANIMSTRUCT_FRAME          ; a
+	const SPRITEANIMSTRUCT_0B             ; b
+	const SPRITEANIMSTRUCT_0C             ; c
+	const SPRITEANIMSTRUCT_0D             ; d
+	const SPRITEANIMSTRUCT_0E             ; e
+	const SPRITEANIMSTRUCT_0F             ; f
+
+	const_def
+	const SPRITE_ANIM_FRAMESET_00
+	const SPRITE_ANIM_FRAMESET_01
+	const SPRITE_ANIM_FRAMESET_02
+	const SPRITE_ANIM_FRAMESET_03
+	const SPRITE_ANIM_FRAMESET_04
+	const SPRITE_ANIM_FRAMESET_05
+	const SPRITE_ANIM_FRAMESET_06
+	const SPRITE_ANIM_FRAMESET_07
+	const SPRITE_ANIM_FRAMESET_08
+	const SPRITE_ANIM_FRAMESET_09
+	const SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO
+	const SPRITE_ANIM_FRAMESET_0B
+	const SPRITE_ANIM_FRAMESET_0C
+	const SPRITE_ANIM_FRAMESET_SLOT_GOLEM
+	const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY
+	const SPRITE_ANIM_FRAMESET_0F
+	const SPRITE_ANIM_FRAMESET_SLOTS_EGG
+	const SPRITE_ANIM_FRAMESET_WALK_CYCLE
+	const SPRITE_ANIM_FRAMESET_12
+	const SPRITE_ANIM_FRAMESET_13
+	const SPRITE_ANIM_FRAMESET_14
+	const SPRITE_ANIM_FRAMESET_15
+	const SPRITE_ANIM_FRAMESET_16
+	const SPRITE_ANIM_FRAMESET_17
+	const SPRITE_ANIM_FRAMESET_18
+	const SPRITE_ANIM_FRAMESET_19
+	const SPRITE_ANIM_FRAMESET_1A
+	const SPRITE_ANIM_FRAMESET_1B
+	const SPRITE_ANIM_FRAMESET_1C
+	const SPRITE_ANIM_FRAMESET_LEAF
+	const SPRITE_ANIM_FRAMESET_1E
+	const SPRITE_ANIM_FRAMESET_1F
+	const SPRITE_ANIM_FRAMESET_20
+	const SPRITE_ANIM_FRAMESET_21
+	const SPRITE_ANIM_FRAMESET_22
+	const SPRITE_ANIM_FRAMESET_23
+	const SPRITE_ANIM_FRAMESET_24
+	const SPRITE_ANIM_FRAMESET_25
+	const SPRITE_ANIM_FRAMESET_26
+	const SPRITE_ANIM_FRAMESET_27
+	const SPRITE_ANIM_FRAMESET_28
+	const SPRITE_ANIM_FRAMESET_29
+	const SPRITE_ANIM_FRAMESET_2A
+	const SPRITE_ANIM_FRAMESET_2B
+	const SPRITE_ANIM_FRAMESET_2C
+	const SPRITE_ANIM_FRAMESET_2D
+	const SPRITE_ANIM_FRAMESET_2E
+	const SPRITE_ANIM_FRAMESET_2F
+	const SPRITE_ANIM_FRAMESET_30
+	const SPRITE_ANIM_FRAMESET_31
+	const SPRITE_ANIM_FRAMESET_32
+	const SPRITE_ANIM_FRAMESET_33
+	const SPRITE_ANIM_FRAMESET_34
+	const SPRITE_ANIM_FRAMESET_35
+	const SPRITE_ANIM_FRAMESET_36
+	const SPRITE_ANIM_FRAMESET_37
+	const SPRITE_ANIM_FRAMESET_38
+	const SPRITE_ANIM_FRAMESET_39
+	const SPRITE_ANIM_FRAMESET_3A
+	const SPRITE_ANIM_FRAMESET_3B
+	const SPRITE_ANIM_FRAMESET_3C
+	const SPRITE_ANIM_FRAMESET_3D
+	const SPRITE_ANIM_FRAMESET_3E
+	const SPRITE_ANIM_FRAMESET_3F
+	const SPRITE_ANIM_FRAMESET_40
+	const SPRITE_ANIM_FRAMESET_41
+
+	const_def
+	const SPRITE_ANIM_SEQ_NULL
+	const SPRITE_ANIM_SEQ_01
+	const SPRITE_ANIM_SEQ_02
+	const SPRITE_ANIM_SEQ_03
+	const SPRITE_ANIM_SEQ_04
+	const SPRITE_ANIM_SEQ_05
+	const SPRITE_ANIM_SEQ_GAMEFREAK_LOGO
+	const SPRITE_ANIM_SEQ_07
+	const SPRITE_ANIM_SEQ_08
+	const SPRITE_ANIM_SEQ_SLOT_GOLEM
+	const SPRITE_ANIM_SEQ_SLOTS_CHANSEY
+	const SPRITE_ANIM_SEQ_SLOTS_EGG
+	const SPRITE_ANIM_SEQ_0C
+	const SPRITE_ANIM_SEQ_0D
+	const SPRITE_ANIM_SEQ_0E
+	const SPRITE_ANIM_SEQ_0F
+	const SPRITE_ANIM_SEQ_10
+	const SPRITE_ANIM_SEQ_11
+	const SPRITE_ANIM_SEQ_12
+	const SPRITE_ANIM_SEQ_13
+	const SPRITE_ANIM_SEQ_14
+	const SPRITE_ANIM_SEQ_15
+	const SPRITE_ANIM_SEQ_FLY_FROM
+	const SPRITE_ANIM_SEQ_FLY_LEAF
+	const SPRITE_ANIM_SEQ_FLY_TO
+	const SPRITE_ANIM_SEQ_19
+	const SPRITE_ANIM_SEQ_1A
+	const SPRITE_ANIM_SEQ_1B
+	const SPRITE_ANIM_SEQ_1C
+	const SPRITE_ANIM_SEQ_1D
+	const SPRITE_ANIM_SEQ_1E
+	const SPRITE_ANIM_SEQ_1F
+	const SPRITE_ANIM_SEQ_20
+	const SPRITE_ANIM_SEQ_21
+	const SPRITE_ANIM_SEQ_22
+
+	const_def
+	const SPRITE_ANIM_INDEX_00
+	const SPRITE_ANIM_INDEX_01
+	const SPRITE_ANIM_INDEX_02
+	const SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
+	const SPRITE_ANIM_INDEX_04
+	const SPRITE_ANIM_INDEX_05
+	const SPRITE_ANIM_INDEX_SLOT_GOLEM
+	const SPRITE_ANIM_INDEX_SLOTS_CHANSEY
+	const SPRITE_ANIM_INDEX_SLOTS_EGG
+	const SPRITE_ANIM_INDEX_09
+	const SPRITE_ANIM_INDEX_WALK_CYCLE
+	const SPRITE_ANIM_INDEX_0B
+	const SPRITE_ANIM_INDEX_0C
+	const SPRITE_ANIM_INDEX_0D
+	const SPRITE_ANIM_INDEX_0E
+	const SPRITE_ANIM_INDEX_0F
+	const SPRITE_ANIM_INDEX_10
+	const SPRITE_ANIM_INDEX_11
+	const SPRITE_ANIM_INDEX_12
+	const SPRITE_ANIM_INDEX_13
+	const SPRITE_ANIM_INDEX_14
+	const SPRITE_ANIM_INDEX_15
+	const SPRITE_ANIM_INDEX_LEAF
+	const SPRITE_ANIM_INDEX_CUT_TREE
+	const SPRITE_ANIM_INDEX_FLY_LEAF
+	const SPRITE_ANIM_INDEX_19
+	const SPRITE_ANIM_INDEX_1A
+	const SPRITE_ANIM_INDEX_1B
+	const SPRITE_ANIM_INDEX_1C
+	const SPRITE_ANIM_INDEX_1D
+	const SPRITE_ANIM_INDEX_1E
+	const SPRITE_ANIM_INDEX_1F
+	const SPRITE_ANIM_INDEX_20
+	const SPRITE_ANIM_INDEX_21
+	const SPRITE_ANIM_INDEX_22
+	const SPRITE_ANIM_INDEX_23
+	const SPRITE_ANIM_INDEX_24
+	const SPRITE_ANIM_INDEX_25
+	const SPRITE_ANIM_INDEX_26
+	const SPRITE_ANIM_INDEX_27
+	const SPRITE_ANIM_INDEX_28
+	const SPRITE_ANIM_INDEX_29
+	const SPRITE_ANIM_INDEX_2A
+	const SPRITE_ANIM_INDEX_2B
+	const SPRITE_ANIM_INDEX_2C
diff --git a/constants/sram_constants.asm b/constants/sram_constants.asm
new file mode 100755
index 000000000..caac8347b
--- /dev/null
+++ b/constants/sram_constants.asm
@@ -0,0 +1,3 @@
+; Mobile bank 5
+sMobileLoginPassword EQU $aa4b
+LOGIN_PASSWORD_LENGTH EQU 17
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
index e53c201b2..06a263348 100644
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -1,5 +1,6 @@
 ; trainer groups
 	enum_start
+CHRIS EQU __enum__
 	trainerclass TRAINER_NONE ; 0
 	const PHONECONTACT_MOM
 	const PHONECONTACT_BIKESHOP
@@ -7,6 +8,7 @@
 	const PHONECONTACT_ELM
 	const PHONECONTACT_BUENA
 	
+KRIS EQU __enum__
 	trainerclass FALKNER ; 1
 
 	trainerclass WHITNEY ; 2
@@ -639,8 +641,8 @@ const_value = 0
 	const TRNATTR_ITEM1
 	const TRNATTR_ITEM2
 	const TRNATTR_BASEMONEY
-	const TRNATTR_AI1
+	const TRNATTR_AI_MOVE_WEIGHTS
 	const TRNATTR_AI2
-	const TRNATTR_AI3
+	const TRNATTR_AI_ITEM_SWITCH
 	const TRNATTR_AI4
 NUM_TRAINER_ATTRIBUTES EQU const_value
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index a8d348e6c..f7486fc83 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -96,3 +96,10 @@ PC_WITHDRAW EQU 0
 PC_DEPOSIT EQU 1
 DAYCARE_WITHDRAW EQU 2
 DAYCARE_DEPOSIT EQU 3
+
+; wCurrentDexMode
+	const_def
+	const DEXMODE_NEW
+	const DEXMODE_OLD
+	const DEXMODE_ABC
+	const DEXMODE_UNOWN