diff options
author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-01 21:54:11 -0500 |
---|---|---|
committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-01 21:54:11 -0500 |
commit | 92a8c491c3a8c39a7c51b300d759f93aa5157447 (patch) | |
tree | 2b0fca0ca289327e65b3b4339f1523f6060c4437 /macros | |
parent | ffbf2c0f5d28c05c14f67a3cfb123d37157c2ef9 (diff) |
Break up engine/sprites.asm; address yenatch's comments
Diffstat (limited to 'macros')
-rw-r--r-- | macros/event.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/macros/event.asm b/macros/event.asm index f77645c5a..2439a9107 100644 --- a/macros/event.asm +++ b/macros/event.asm @@ -595,26 +595,26 @@ loadpikachudata: macro db loadpikachudata_command endm - enum setup_random_encounter_command -setup_random_encounter: macro - db setup_random_encounter_command + enum randomwildmon_command +randomwildmon: macro + db randomwildmon_command endm - enum memtrainerdata_command -memtrainerdata: macro - db memtrainerdata_command + enum loadmemtrainer_command +loadmemtrainer: macro + db loadmemtrainer_command endm - enum scriptedpokedata_command -scriptedpokedata: macro - db scriptedpokedata_command + enum loadwildmon_command +loadwildmon: macro + db loadwildmon_command db \1 ; pokemon db \2 ; level endm - enum scriptedtrainerdata_command -scriptedtrainerdata: macro - db scriptedtrainerdata_command + enum loadtrainer_command +loadtrainer: macro + db loadtrainer_command db \1 ; trainer_group db \2 ; trainer_id endm |