diff options
Diffstat (limited to 'macros/scripts')
| -rw-r--r-- | macros/scripts/gfx_anims.asm | 2 | ||||
| -rw-r--r-- | macros/scripts/maps.asm | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/macros/scripts/gfx_anims.asm b/macros/scripts/gfx_anims.asm index 61c18fa8b..2c4c267b3 100644 --- a/macros/scripts/gfx_anims.asm +++ b/macros/scripts/gfx_anims.asm @@ -5,7 +5,7 @@ frame: MACRO x = \2 if _NARG > 2 rept _NARG - 2 -x = x | (1 << (\3 + 1)) +x |= 1 << (\3 + 1) shift endr endc diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index a394405d4..0621277ba 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -17,7 +17,7 @@ scene_script: MACRO ;\1: script pointer dw \1 dw 0 ; filler -{_NUM_SCENE_SCRIPTS} = {_NUM_SCENE_SCRIPTS} + 1 +{_NUM_SCENE_SCRIPTS} += 1 ENDM def_callbacks: MACRO @@ -30,7 +30,7 @@ callback: MACRO ;\1: type: a MAPCALLBACK_* constant ;\2: script pointer dbw \1, \2 -{_NUM_CALLBACKS} = {_NUM_CALLBACKS} + 1 +{_NUM_CALLBACKS} += 1 ENDM def_warp_events: MACRO @@ -46,7 +46,7 @@ warp_event: MACRO ;\4: warp destination: starts at 1 db \2, \1, \4 map_id \3 -{_NUM_WARP_EVENTS} = {_NUM_WARP_EVENTS} + 1 +{_NUM_WARP_EVENTS} += 1 ENDM def_coord_events: MACRO @@ -64,7 +64,7 @@ coord_event: MACRO db 0 ; filler dw \4 dw 0 ; filler -{_NUM_COORD_EVENTS} = {_NUM_COORD_EVENTS} + 1 +{_NUM_COORD_EVENTS} += 1 ENDM def_bg_events: MACRO @@ -80,7 +80,7 @@ bg_event: MACRO ;\4: script pointer db \2, \1, \3 dw \4 -{_NUM_BG_EVENTS} = {_NUM_BG_EVENTS} + 1 +{_NUM_BG_EVENTS} += 1 ENDM def_object_events: MACRO @@ -114,7 +114,7 @@ object_event: MACRO dw \<12>, \<13> ; the dummy PlayerObjectTemplate object_event has no def_object_events if DEF(_NUM_OBJECT_EVENTS) -{_NUM_OBJECT_EVENTS} = {_NUM_OBJECT_EVENTS} + 1 +{_NUM_OBJECT_EVENTS} += 1 endc ENDM |