diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
| commit | 3cb79cf078e82206796e1b834393ab771593de72 (patch) | |
| tree | 3e27550ab45ce782db8f2e182819015ba3aef733 /asm/macros.s | |
| parent | f5d9daeca38728f67db92a175c37e5a3bc18cee3 (diff) | |
| parent | 19bffecc4deb401aa51add3b95163b72686f40ee (diff) | |
Merge 'master' with 'origin/master'
Diffstat (limited to 'asm/macros.s')
| -rw-r--r-- | asm/macros.s | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/asm/macros.s b/asm/macros.s index fbead93b9..42c35026e 100644 --- a/asm/macros.s +++ b/asm/macros.s @@ -4,7 +4,6 @@ .include "asm/macros/pokemon_data.s" .include "asm/macros/ec.s" .include "asm/macros/map.s" - .include "asm/macros/field_effect_script.s" .macro region_map_location x, y, width, height, name .byte \x @@ -119,7 +118,7 @@ .2byte \unknown .fill 4 @ padding .endm - + .macro credits_entry number, text .4byte \number .4byte \text @@ -137,3 +136,14 @@ .4byte \tile_addr .4byte \palette_addr .endm + + .macro trainer_eye_trainer opp_1, opp_2, opp_3, opp_4, opp_5, map_name + .2byte OPPONENT_\opp_1 + .2byte OPPONENT_\opp_2 + .2byte OPPONENT_\opp_3 + .2byte OPPONENT_\opp_4 + .2byte OPPONENT_\opp_5 + .2byte GROUP_\map_name + .2byte MAP_\map_name + .space 2 + .endm |