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/scripts | |
| 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/scripts')
| -rw-r--r-- | macros/scripts/audio.asm | 14 | ||||
| -rw-r--r-- | macros/scripts/battle_anims.asm (renamed from macros/scripts/move_anim.asm) | 2 | ||||
| -rw-r--r-- | macros/scripts/battle_commands.asm (renamed from macros/scripts/effect_commands.asm) | 2 | ||||
| -rw-r--r-- | macros/scripts/events.asm (renamed from macros/scripts/event.asm) | 0 | ||||
| -rw-r--r-- | macros/scripts/gfx_anims.asm (renamed from macros/scripts/gfx_anim.asm) | 0 | ||||
| -rw-r--r-- | macros/scripts/trade_anims.asm (renamed from macros/scripts/trade_anim.asm) | 0 |
6 files changed, 7 insertions, 11 deletions
diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm index 83ff44963..b1d340a91 100644 --- a/macros/scripts/audio.asm +++ b/macros/scripts/audio.asm @@ -1,3 +1,8 @@ +musicheader: macro + ; number of tracks, track idx, address + dbw ((\1 - 1) << 6) + (\2 - 1), \3 + endm + note: MACRO dn (\1), (\2) - 1 ENDM @@ -14,15 +19,6 @@ noise: macro db \4 ; frequency endm -musicheader: macro - ; number of tracks, track idx, address - dbw ((\1 - 1) << 6) + (\2 - 1), \3 - endm - -cry_header: macro - dw \1, \2, \3 - endm - ; MusicCommands indexes (see audio/engine.asm) enum_start $d8 diff --git a/macros/scripts/move_anim.asm b/macros/scripts/battle_anims.asm index 7714bb09a..3c054d460 100644 --- a/macros/scripts/move_anim.asm +++ b/macros/scripts/battle_anims.asm @@ -5,7 +5,7 @@ endc db \1 endm -; BattleAnimCommands indexes (see battle/anim_commands.asm) +; BattleAnimCommands indexes (see engine/battle_anims/anim_commands.asm) enum_start $d0 enum anim_obj_command ; $d0 diff --git a/macros/scripts/effect_commands.asm b/macros/scripts/battle_commands.asm index 4fd2475b7..5ac9009ff 100644 --- a/macros/scripts/effect_commands.asm +++ b/macros/scripts/battle_commands.asm @@ -3,7 +3,7 @@ command: macro \1 equs "db \1_command" endm -; BattleCommandPointers indexes (see battle/effect_commands.asm) +; BattleCommandPointers indexes (see data/battle_command_pointers.asm) enum_start 1 command checkturn ; 01 command checkobedience ; 02 diff --git a/macros/scripts/event.asm b/macros/scripts/events.asm index 1bf6b8622..1bf6b8622 100644 --- a/macros/scripts/event.asm +++ b/macros/scripts/events.asm diff --git a/macros/scripts/gfx_anim.asm b/macros/scripts/gfx_anims.asm index a3fa710a0..a3fa710a0 100644 --- a/macros/scripts/gfx_anim.asm +++ b/macros/scripts/gfx_anims.asm diff --git a/macros/scripts/trade_anim.asm b/macros/scripts/trade_anims.asm index 4b0291eea..4b0291eea 100644 --- a/macros/scripts/trade_anim.asm +++ b/macros/scripts/trade_anims.asm |