diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/legacy.asm | 4 | ||||
| -rwxr-xr-x | macros/wram.asm | 18 |
2 files changed, 13 insertions, 9 deletions
diff --git a/macros/legacy.asm b/macros/legacy.asm index 245e24c6e..a139e02b4 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -55,6 +55,10 @@ displaylocation EQUS "landmarktotext" ; macros/scripts/maps.asm +mapconst: MACRO + map_const \1, \3, \2 +ENDM + maptrigger EQUS "scene_script" warp_def: MACRO diff --git a/macros/wram.asm b/macros/wram.asm index ff144d71f..8936bfd14 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -177,15 +177,15 @@ ENDM battle_tower_struct: MACRO \1Name:: ds NAME_LENGTH + -1 \1TrainerClass:: ds 1 -\1Pkmn1:: party_struct \1Pkmn1 -\1Pkmn1Name:: ds MON_NAME_LENGTH -\1Pkmn1NameEnd:: -\1Pkmn2:: party_struct \1Pkmn2 -\1Pkmn2Name:: ds MON_NAME_LENGTH -\1Pkmn2NameEnd:: -\1Pkmn3:: party_struct \1Pkmn3 -\1Pkmn3Name:: ds MON_NAME_LENGTH -\1Pkmn3NameEnd:: +\1Mon1:: party_struct \1Mon1 +\1Mon1Name:: ds MON_NAME_LENGTH +\1Mon1NameEnd:: +\1Mon2:: party_struct \1Mon2 +\1Mon2Name:: ds MON_NAME_LENGTH +\1Mon2NameEnd:: +\1Mon3:: party_struct \1Mon3 +\1Mon3Name:: ds MON_NAME_LENGTH +\1Mon3NameEnd:: \1TrainerData:: ds BATTLETOWER_TRAINERDATALENGTH \1TrainerEnd:: ENDM |