diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2017-12-28 13:23:44 +0100 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2017-12-28 13:23:44 +0100 |
| commit | 7beb497d3aba7cd1bb34f2b1394bde80c1cd9807 (patch) | |
| tree | a392d05e31ce2c3c614992a4a3100a65f012fd2e /engine | |
| parent | 9457679af8d36a140db7b8832df595e8310e6bb4 (diff) | |
Uppercase MACRO and EQU(S) according to the style guide
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/battle_transition.asm | 2 | ||||
| -rw-r--r-- | engine/pic_animation.asm | 4 | ||||
| -rwxr-xr-x | engine/unown_puzzle.asm | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index bef74ad29..f0c7a9b61 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -828,7 +828,7 @@ StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768) ; 8c792 (23:4792) .boxes ; 8c792 -zoombox: macro +zoombox: MACRO ; width, height, start y, start x db \1, \2 dwcoord \3, \4 diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index 2b93ef749..31780342e 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -56,7 +56,7 @@ pokeanim: MACRO rept _NARG ; Workaround for a bug where macro args can't come after the start of a symbol if !def(\1_POKEANIM) -\1_POKEANIM equs "PokeAnim_\1_" +\1_POKEANIM EQUS "PokeAnim_\1_" endc db (\1_POKEANIM - PokeAnim_SetupCommands) / 2 shift @@ -142,7 +142,7 @@ SetUpPokeAnim: ; d00b4 ; d00da PokeAnim_SetupCommands: ; d00da -setup_command: macro +setup_command: MACRO \1_: dw \1 endm setup_command PokeAnim_Finish diff --git a/engine/unown_puzzle.asm b/engine/unown_puzzle.asm index 3afe8a17d..6b43df67e 100755 --- a/engine/unown_puzzle.asm +++ b/engine/unown_puzzle.asm @@ -114,7 +114,7 @@ InitUnownPuzzlePiecePositions: ; e124e ; e126d .PuzzlePieceInitialPositions: ; e126d -initpuzcoord: macro +initpuzcoord: MACRO rept _NARG / 2 db \1 puzcoord \2 shift @@ -599,7 +599,7 @@ RedrawUnownPuzzlePieces: ; e14d9 UnownPuzzleCoordData: ; e1559 -puzzle_coords: macro +puzzle_coords: MACRO dbpixel \1, \2, \3, \4 dwcoord \5, \6 db \7, \8 |