diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/battle_transition.asm | 2 | ||||
| -rw-r--r-- | engine/battle_anims/bg_effects.asm | 2 | ||||
| -rwxr-xr-x | engine/billspc.asm | 2 | ||||
| -rwxr-xr-x | engine/card_flip.asm | 2 | ||||
| -rw-r--r-- | engine/events/crystal_unown.asm | 2 | ||||
| -rw-r--r-- | engine/events/print_unown_2.asm | 2 | ||||
| -rw-r--r-- | engine/pic_animation.asm | 4 | ||||
| -rwxr-xr-x | engine/unown_puzzle.asm | 4 |
8 files changed, 10 insertions, 10 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index 47c3b9f41..f2fef5553 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -832,7 +832,7 @@ zoombox: MACRO ; width, height, start y, start x db \1, \2 dwcoord \3, \4 -endm +ENDM zoombox 4, 2, 8, 8 zoombox 6, 4, 7, 7 zoombox 8, 6, 6, 6 diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index ab4a8036b..c1a2bef4b 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -871,7 +871,7 @@ BattleBGEffect_RunPicResizeScript: ; c83ed (32:43ed) bgsquare: MACRO dn \1, \2 dw \3 -endm +ENDM bgsquare 6, 6, .SixBySix bgsquare 4, 4, .FourByFour diff --git a/engine/billspc.asm b/engine/billspc.asm index 80dee0cc8..554fb6bf1 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -1450,7 +1450,7 @@ ENDC ld a, [wd004] inc a ld [wBillsPC_NumMonsInBox], a -endm +ENDM CopyBoxmonSpecies: ; e2d30 (38:6d30) xor a diff --git a/engine/card_flip.asm b/engine/card_flip.asm index c1585c5dc..f03db190d 100755 --- a/engine/card_flip.asm +++ b/engine/card_flip.asm @@ -1413,7 +1413,7 @@ else dbpixel \1, \2 dw \3 endc -endm +ENDM cardflip_cursor 11, 2, .Impossible cardflip_cursor 12, 2, .Impossible diff --git a/engine/events/crystal_unown.asm b/engine/events/crystal_unown.asm index 6c0e972f8..352306055 100644 --- a/engine/events/crystal_unown.asm +++ b/engine/events/crystal_unown.asm @@ -178,7 +178,7 @@ endc shift endr db $ff -endm +ENDM .UnownText_Escape: ; db $08, $44, $04, $00, $2e, $08, $ff diff --git a/engine/events/print_unown_2.asm b/engine/events/print_unown_2.asm index 057db5176..c932ded38 100644 --- a/engine/events/print_unown_2.asm +++ b/engine/events/print_unown_2.asm @@ -105,7 +105,7 @@ x = x +- \2 endr y = y + 1 endr -endm +ENDM UnownPrinter_OverworldMapRectangle: ; e008b overworldmaprect 7, 7 diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index bb7615ae0..b060f5b4b 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -144,7 +144,7 @@ SetUpPokeAnim: ; d00b4 PokeAnim_SetupCommands: ; d00da setup_command: MACRO \1_: dw \1 -endm +ENDM setup_command PokeAnim_Finish setup_command PokeAnim_BasePic setup_command PokeAnim_SetWait @@ -586,7 +586,7 @@ x = x + 1 endr y = y + 7 endr -endm +ENDM PokeAnim_ConvertAndApplyBitmask: ; d036b xor a diff --git a/engine/unown_puzzle.asm b/engine/unown_puzzle.asm index a2b8ac86e..525345e68 100755 --- a/engine/unown_puzzle.asm +++ b/engine/unown_puzzle.asm @@ -120,7 +120,7 @@ rept _NARG / 2 shift shift endr -endm +ENDM initpuzcoord 0,0, 0,1, 0,2, 0,3, 0,4, 0,5 initpuzcoord 1,0, 1,5 initpuzcoord 2,0, 2,5 @@ -603,7 +603,7 @@ puzzle_coords: MACRO dbpixel \1, \2, \3, \4 dwcoord \5, \6 db \7, \8 -endm +ENDM ; OAM coords, tilemap coords, vacant tile, filler puzzle_coords 3, 3, 4, 4, 1, 0, PUZZLE_BORDER, 0 puzzle_coords 6, 3, 4, 4, 4, 0, PUZZLE_BORDER, 0 |