mirror of https://github.com/pret/pokecrystal.git
Use compound assignment operators
This commit is contained in:
Rangi
parent
6834c7a9a1
commit
ab0f9c287a
|
|
@ -70,7 +70,7 @@ __deco_value__ = 0
|
|||
deco: MACRO
|
||||
const DECO_\1
|
||||
DECOFLAG_\1 EQU __deco_value__
|
||||
__deco_value__ = __deco_value__ + 1
|
||||
__deco_value__ += 1
|
||||
ENDM
|
||||
|
||||
; decorations:
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ __tmhm_value__ = 1
|
|||
|
||||
add_tmnum: MACRO
|
||||
\1_TMNUM EQU __tmhm_value__
|
||||
__tmhm_value__ = __tmhm_value__ + 1
|
||||
__tmhm_value__ += 1
|
||||
ENDM
|
||||
|
||||
add_tm: MACRO
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ map_const: MACRO
|
|||
;\3: height: in blocks
|
||||
GROUP_\1 EQU const_value
|
||||
MAP_\1 EQU __map_value__
|
||||
__map_value__ = __map_value__ + 1
|
||||
__map_value__ += 1
|
||||
\1_WIDTH EQU \2
|
||||
\1_HEIGHT EQU \3
|
||||
ENDM
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ __trainer_class__ = 0
|
|||
|
||||
trainerclass: MACRO
|
||||
\1 EQU __trainer_class__
|
||||
__trainer_class__ = __trainer_class__ + 1
|
||||
__trainer_class__ += 1
|
||||
const_def 1
|
||||
ENDM
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
NUM_ODD_EGGS EQU 14
|
||||
|
||||
prob: MACRO
|
||||
prob_total = prob_total + (\1)
|
||||
prob_total += \1
|
||||
dw prob_total * $ffff / 100
|
||||
ENDM
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ rept _NARG
|
|||
if DEF(\1_TMNUM)
|
||||
n = (\1_TMNUM - 1) / 8
|
||||
i = (\1_TMNUM - 1) % 8
|
||||
_tm{d:n} = _tm{d:n} | (1 << i)
|
||||
_tm{d:n} |= 1 << i
|
||||
else
|
||||
fail "\1 is not a TM, HM, or tutor move"
|
||||
endc
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ rept _NARG - 1
|
|||
shift
|
||||
endr
|
||||
db 0
|
||||
list_index = list_index + 1
|
||||
list_index += 1
|
||||
ENDM
|
||||
|
||||
RoamMaps:
|
||||
|
|
|
|||
|
|
@ -727,7 +727,7 @@ 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
|
||||
```
|
||||
|
|
|
|||
|
|
@ -1441,16 +1441,16 @@ endr
|
|||
hue = 31
|
||||
rept 8
|
||||
RGB hue, hue, hue
|
||||
hue = hue - 1
|
||||
hue -= 1
|
||||
RGB hue, hue, hue
|
||||
hue = hue - 2
|
||||
hue -= 2
|
||||
endr
|
||||
|
||||
.SlowFadePalettes:
|
||||
hue = 31
|
||||
rept 16
|
||||
RGB hue, hue, hue
|
||||
hue = hue - 1
|
||||
hue -= 1
|
||||
endr
|
||||
|
||||
Intro_LoadTilemap:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -4073,7 +4073,7 @@ EZChat_SortedWords:
|
|||
; any Pokemon you've seen that starts with each kana.
|
||||
macro_11f23c: MACRO
|
||||
dw w3_d012 - w3_d000 + x, \1
|
||||
x = x + 2 * \1
|
||||
x += 2 * \1
|
||||
ENDM
|
||||
x = 0
|
||||
macro_11f23c $2f ; a
|
||||
|
|
|
|||
Loading…
Reference in New Issue