diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-03 11:51:00 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-03 11:51:00 -0400 |
| commit | b29e5ee203b6fa4592180ef6cca732462cca9af6 (patch) | |
| tree | 7634ed34bcc174f6df004a473b277d1cc3f8f218 /engine/battle/core.asm | |
| parent | Merge pull request #256 from Rangi42/master (diff) | |
| download | pokeyellow-b29e5ee203b6fa4592180ef6cca732462cca9af6.tar.gz pokeyellow-b29e5ee203b6fa4592180ef6cca732462cca9af6.tar.xz pokeyellow-b29e5ee203b6fa4592180ef6cca732462cca9af6.zip | |
Add subdirectories to data/ similar to pokecrystal
Top level text/ is now solely for the former text/maps/ files, and other files are in their respective subdirectories in data/.
Diffstat (limited to 'engine/battle/core.asm')
| -rwxr-xr-x | engine/battle/core.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 75841ccf..fec10215 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3814,7 +3814,7 @@ DetermineExclamationPointTextNum: pop bc ret -INCLUDE "data/move_grammar.asm" +INCLUDE "data/moves/grammar.asm" PrintMoveFailureText: ld de, wPlayerMoveEffect @@ -5317,7 +5317,7 @@ AIGetTypeEffectiveness: ld [wTypeEffectiveness], a ; store damage multiplier ret -INCLUDE "data/type_effects.asm" +INCLUDE "data/types/type_matchups.asm" ; some tests that need to pass for a move to hit MoveHitTest: |