diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-22 16:23:34 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-22 16:23:34 -0500 |
| commit | cb5e3378de0582217cdb308d33cee7afb4d7cb89 (patch) | |
| tree | da5c9f5da1d93265727b85ee3cb328d4a8f5e78b | |
| parent | efe6981a0db99aa2deeb7fbea5a51c9e40dd4138 (diff) | |
Move type data to data/types/
| -rw-r--r-- | constants/type_constants.asm | 3 | ||||
| -rw-r--r-- | data/types/type_boost_items.asm (renamed from data/battle/type_boost_items.asm) | 0 | ||||
| -rw-r--r-- | data/types/type_matchups.asm (renamed from data/battle/type_matchups.asm) | 0 | ||||
| -rw-r--r-- | engine/battle/effect_commands.asm | 4 |
4 files changed, 4 insertions, 3 deletions
diff --git a/constants/type_constants.asm b/constants/type_constants.asm index 6587c3a70..c3524e9d9 100644 --- a/constants/type_constants.asm +++ b/constants/type_constants.asm @@ -2,7 +2,8 @@ ; also used in: ; - PokedexTypeSearchConversionTable (see data/types/search_types.asm) ; - PokedexTypeSearchStrings (see data/types/search_strings.asm) -; - TypeMatchups (see data/battle/type_matchups.asm) +; - TypeMatchups (see data/types/type_matchups.asm) +; - TypeBoostItems (see data/types/type_boost_items.asm) const_def PHYSICAL EQU const_value diff --git a/data/battle/type_boost_items.asm b/data/types/type_boost_items.asm index 3b7231a59..3b7231a59 100644 --- a/data/battle/type_boost_items.asm +++ b/data/types/type_boost_items.asm diff --git a/data/battle/type_matchups.asm b/data/types/type_matchups.asm index 90e38ae2c..90e38ae2c 100644 --- a/data/battle/type_matchups.asm +++ b/data/types/type_matchups.asm diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index c1bc3752a..ba4dc72f8 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -1639,7 +1639,7 @@ BattleCommand_ResetTypeMatchup: ; 34833 INCLUDE "engine/battle/ai/switch.asm" -INCLUDE "data/battle/type_matchups.asm" +INCLUDE "data/types/type_matchups.asm" BattleCommand_DamageVariation: ; 34cfd ; damagevariation @@ -3642,7 +3642,7 @@ BattleCommand_DamageCalc: ; 35612 ; 35703 -INCLUDE "data/battle/type_boost_items.asm" +INCLUDE "data/types/type_boost_items.asm" BattleCommand_ConstantDamage: ; 35726 |