diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-08-31 18:45:31 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-08-31 18:45:31 -0400 |
| commit | ab04f0d19f36812069a0374b350d80729d750329 (patch) | |
| tree | 3b90f4f32769ab3ee45405c366565db0d9b4696f /asm/macros.s | |
| parent | 479be386e5f8b863e02905334f73ba88c1702049 (diff) | |
| parent | 2c2f4255cb96c3fea95e5fac7655c00cabff9cfb (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'asm/macros.s')
| -rw-r--r-- | asm/macros.s | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/asm/macros.s b/asm/macros.s index 49ed99695..42c35026e 100644 --- a/asm/macros.s +++ b/asm/macros.s @@ -118,7 +118,7 @@ .2byte \unknown .fill 4 @ padding .endm - + .macro credits_entry number, text .4byte \number .4byte \text @@ -136,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 |