diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-28 01:30:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-28 01:30:36 -0500 |
| commit | da28d1a84b0499bead314e17ae2ff0d13eb03196 (patch) | |
| tree | c212adfc53d1996c06f2e4be1d6e480e687a2ad8 /macros.asm | |
| parent | bad9e33530af8cdc29ce5629df682fc7915bfff0 (diff) | |
| parent | 2c4777f3363cd64d05fb00084fd83dff8ac31674 (diff) | |
Merge pull request #437 from roukaour/master
Reorganize battle/; rename most "header" misnomers; gfx/pics → gfx/pokemon
Diffstat (limited to 'macros.asm')
| -rw-r--r-- | macros.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/macros.asm b/macros.asm index cce53b45f..b6598c933 100644 --- a/macros.asm +++ b/macros.asm @@ -11,13 +11,13 @@ INCLUDE "macros/tilesets.asm" INCLUDE "macros/scripts/audio.asm" INCLUDE "macros/scripts/maps.asm" -INCLUDE "macros/scripts/event.asm" +INCLUDE "macros/scripts/events.asm" INCLUDE "macros/scripts/text.asm" INCLUDE "macros/scripts/movement.asm" -INCLUDE "macros/scripts/effect_commands.asm" -INCLUDE "macros/scripts/move_anim.asm" -INCLUDE "macros/scripts/trade_anim.asm" -INCLUDE "macros/scripts/gfx_anim.asm" +INCLUDE "macros/scripts/battle_commands.asm" +INCLUDE "macros/scripts/battle_anims.asm" +INCLUDE "macros/scripts/trade_anims.asm" +INCLUDE "macros/scripts/gfx_anims.asm" percent EQUS "* $ff / 100" |