Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use compound assignment operators

Browse Source
This commit is contained in:
Rangi
2021-11-23 20:18:08 -05:00
parent 6834c7a9a1
commit ab0f9c287a
17 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
macros/asserts.asm
View File

@@ -29,7 +29,7 @@ ENDM
li: MACRO
assert !STRIN(\1, "@"), STRCAT("String terminator \"@\" in list entry: ", \1)
db \1, "@"
list_index = list_index + 1
list_index += 1
ENDM
assert_list_length: MACRO

2
macros/code.asm
View File

@@ -38,7 +38,7 @@ maskbits: MACRO
x = 1
rept 8
if x + 1 < (\1)
x = x << 1 | 1
x = (x << 1) | 1
endc
endr
if _NARG == 2

10
macros/const.asm
View File

@@ -15,19 +15,19 @@ ENDM
const: MACRO
\1 EQU const_value
const_value = const_value + const_inc
const_value += const_inc
ENDM
shift_const: MACRO
\1 EQU (1 << const_value)
const_value = const_value + const_inc
\1 EQU 1 << const_value
const_value += const_inc
ENDM
const_skip: MACRO
if _NARG >= 1
const_value = const_value + const_inc * (\1)
const_value += const_inc * (\1)
else
const_value = const_value + const_inc
const_value += const_inc
endc
ENDM

2
macros/data.asm
View File

@@ -98,6 +98,6 @@ sine_table: MACRO
x = 0
rept \1
dw (sin(x) + (sin(x) & $ff)) >> 8 ; round up
x = x + DIV(32768, \1) ; a circle has 65536 "degrees"
x += DIV(32768, \1) ; a circle has 65536 "degrees"
endr
ENDM

2
macros/scripts/gfx_anims.asm
View File

@@ -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

12
macros/scripts/maps.asm
View File

@@ -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