diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-02-04 11:17:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-04 11:17:14 -0500 |
| commit | ed44d1cdb7e2f389be56a0158f8ce857e02a76b3 (patch) | |
| tree | f0b0c99546651898e1c326697164f2f95aa97d0b /constants | |
| parent | dd6812c06a3a5123fa277c9c07089cb35647b4d2 (diff) | |
| parent | 24a23b19224fd8d2ac255e810c4b9c235118277a (diff) | |
Merge pull request #680 from Rangi42/master
Miscellaneous fixes for #676
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/pokemon_data_constants.asm | 3 | ||||
| -rw-r--r-- | constants/script_constants.asm | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 9ba6953d9..cbdbbd17b 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -19,7 +19,8 @@ BASE_UNKNOWN_1 EQUS "(wBaseUnknown1 - wCurBaseData)" BASE_EGG_STEPS EQUS "(wBaseEggSteps - wCurBaseData)" BASE_UNKNOWN_2 EQUS "(wBaseUnknown2 - wCurBaseData)" BASE_PIC_SIZE EQUS "(wBasePicSize - wCurBaseData)" -BASE_PADDING EQUS "(wBasePadding - wCurBaseData)" +BASE_FRONTPIC EQUS "(wBaseUnusedFrontpic - wCurBaseData)" +BASE_BACKPIC EQUS "(wBaseUnusedBackpic - wCurBaseData)" BASE_GROWTH_RATE EQUS "(wBaseGrowthRate - wCurBaseData)" BASE_EGG_GROUPS EQUS "(wBaseEggGroups - wCurBaseData)" BASE_TMHM EQUS "(wBaseTMHM - wCurBaseData)" diff --git a/constants/script_constants.asm b/constants/script_constants.asm index cfcbfbb52..30935e632 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -138,6 +138,7 @@ OBJECT_EVENT_SIZE EQU 13 ; object_event ; command queue members CMDQUEUE_TYPE EQU 0 CMDQUEUE_ADDR EQU 1 +CMDQUEUE_02 EQU 2 CMDQUEUE_03 EQU 3 CMDQUEUE_04 EQU 4 CMDQUEUE_05 EQU 5 |