thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use compound assignment operators

Browse source
This commit is contained in:
Rangi 2021-11-23 20:56:57 -05:00
parent 64e2b66a61
commit 865d37e02a
8 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/item_constants.asm
View file

@ -122,7 +122,7 @@ __tmhm_value__ = NUM_TMS + 1
add_tmnum: MACRO add_tmnum: MACRO
\1_TMNUM EQU __tmhm_value__ \1_TMNUM EQU __tmhm_value__
__tmhm_value__ = __tmhm_value__ + 1 __tmhm_value__ += 1
ENDM ENDM
add_hm: MACRO add_hm: MACRO

2
data/trainers/move_choices.asm
View file

@ -3,7 +3,7 @@ move_choices: MACRO
db \# ; all args db \# ; all args
ENDC ENDC
db 0 ; end db 0 ; end
list_index = list_index + 1 list_index += 1
ENDM ENDM
; move choice modification methods that are applied for each trainer class ; move choice modification methods that are applied for each trainer class

8
macros/asserts.asm
View file

@ -29,7 +29,7 @@ ENDM
li: MACRO li: MACRO
ASSERT !STRIN(\1, "@"), STRCAT("String terminator \"@\" in list entry: ", \1) ASSERT !STRIN(\1, "@"), STRCAT("String terminator \"@\" in list entry: ", \1)
db \1, "@" db \1, "@"
list_index = list_index + 1 list_index += 1
ENDM ENDM
assert_list_length: MACRO assert_list_length: MACRO
@ -52,7 +52,7 @@ ENDM
nybble: MACRO nybble: MACRO
ASSERT 0 <= (\1) && (\1) < $10, "nybbles must be 0-15" ASSERT 0 <= (\1) && (\1) < $10, "nybbles must be 0-15"
CURRENT_NYBBLE_ARRAY_VALUE = (\1) | (CURRENT_NYBBLE_ARRAY_VALUE << 4) CURRENT_NYBBLE_ARRAY_VALUE = (\1) | (CURRENT_NYBBLE_ARRAY_VALUE << 4)
CURRENT_NYBBLE_ARRAY_LENGTH = CURRENT_NYBBLE_ARRAY_LENGTH + 1 CURRENT_NYBBLE_ARRAY_LENGTH += 1
IF CURRENT_NYBBLE_ARRAY_LENGTH % 2 == 0 IF CURRENT_NYBBLE_ARRAY_LENGTH % 2 == 0
db CURRENT_NYBBLE_ARRAY_VALUE db CURRENT_NYBBLE_ARRAY_VALUE
CURRENT_NYBBLE_ARRAY_VALUE = 0 CURRENT_NYBBLE_ARRAY_VALUE = 0
@ -86,8 +86,8 @@ ENDM
dbit: MACRO dbit: MACRO
ASSERT (\1) == 0 || (\1) == 1, "bits must be 0 or 1" ASSERT (\1) == 0 || (\1) == 1, "bits must be 0 or 1"
CURRENT_BIT_ARRAY_VALUE = CURRENT_BIT_ARRAY_VALUE | ((\1) << (CURRENT_BIT_ARRAY_LENGTH % 8)) CURRENT_BIT_ARRAY_VALUE |= (\1) << (CURRENT_BIT_ARRAY_LENGTH % 8)
CURRENT_BIT_ARRAY_LENGTH = CURRENT_BIT_ARRAY_LENGTH + 1 CURRENT_BIT_ARRAY_LENGTH += 1
IF CURRENT_BIT_ARRAY_LENGTH % 8 == 0 IF CURRENT_BIT_ARRAY_LENGTH % 8 == 0
db CURRENT_BIT_ARRAY_VALUE db CURRENT_BIT_ARRAY_VALUE
CURRENT_BIT_ARRAY_VALUE = 0 CURRENT_BIT_ARRAY_VALUE = 0

10
macros/const.asm
View file

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

2
macros/data.asm
View file

@ -24,7 +24,7 @@ REPT _NARG
IF DEF(\1_TMNUM) IF DEF(\1_TMNUM)
n = (\1_TMNUM - 1) / 8 n = (\1_TMNUM - 1) / 8
i = (\1_TMNUM - 1) % 8 i = (\1_TMNUM - 1) % 8
_tm{d:n} = _tm{d:n} | (1 << i) _tm{d:n} |= 1 << i
ELSE ELSE
FAIL "\1 is not a TM or HM move" FAIL "\1 is not a TM or HM move"
ENDC ENDC

12
macros/scripts/events.asm
View file

@ -261,8 +261,8 @@ event_fill_start = event_start_byte + 1
event_fill_count = event_end_byte - event_start_byte - 1 event_fill_count = event_end_byte - event_start_byte - 1
IF ((\1) % 8) == 0 IF ((\1) % 8) == 0
event_fill_start = event_fill_start - 1 event_fill_start -= 1
event_fill_count = event_fill_count + 1 event_fill_count += 1
ELSE ELSE
ld a, [wEventFlags + event_start_byte] ld a, [wEventFlags + event_start_byte]
or $ff - ((1 << ((\1) % 8)) - 1) or $ff - ((1 << ((\1) % 8)) - 1)
@ -270,7 +270,7 @@ event_fill_count = event_fill_count + 1
ENDC ENDC
IF ((\2) % 8) == 7 IF ((\2) % 8) == 7
event_fill_count = event_fill_count + 1 event_fill_count += 1
ENDC ENDC
IF event_fill_count == 1 IF event_fill_count == 1
@ -323,8 +323,8 @@ event_fill_start = event_start_byte + 1
event_fill_count = event_end_byte - event_start_byte - 1 event_fill_count = event_end_byte - event_start_byte - 1
IF ((\1) % 8) == 0 IF ((\1) % 8) == 0
event_fill_start = event_fill_start - 1 event_fill_start -= 1
event_fill_count = event_fill_count + 1 event_fill_count += 1
ELSE ELSE
ld a, [wEventFlags + event_start_byte] ld a, [wEventFlags + event_start_byte]
and ~($ff - ((1 << ((\1) % 8)) - 1)) & $ff and ~($ff - ((1 << ((\1) % 8)) - 1)) & $ff
@ -332,7 +332,7 @@ event_fill_count = event_fill_count + 1
ENDC ENDC
IF ((\2) % 8) == 7 IF ((\2) % 8) == 7
event_fill_count = event_fill_count + 1 event_fill_count += 1
ENDC ENDC
IF event_fill_count == 1 IF event_fill_count == 1

8
macros/scripts/maps.asm
View file

@ -29,7 +29,7 @@ object_event: MACRO
ELSE ELSE
db \6 db \6
ENDC ENDC
{_NUM_OBJECT_EVENTS} = {_NUM_OBJECT_EVENTS} + 1 {_NUM_OBJECT_EVENTS} += 1
ENDM ENDM
def_warp_events: MACRO def_warp_events: MACRO
@ -46,7 +46,7 @@ warp_event: MACRO
db \2, \1, \4 - 1, \3 db \2, \1, \4 - 1, \3
_WARP_{d:{_NUM_WARP_EVENTS}}_X = \1 _WARP_{d:{_NUM_WARP_EVENTS}}_X = \1
_WARP_{d:{_NUM_WARP_EVENTS}}_Y = \2 _WARP_{d:{_NUM_WARP_EVENTS}}_Y = \2
{_NUM_WARP_EVENTS} = {_NUM_WARP_EVENTS} + 1 {_NUM_WARP_EVENTS} += 1
ENDM ENDM
def_bg_events: MACRO def_bg_events: MACRO
@ -60,7 +60,7 @@ ENDM
;\3 sign id ;\3 sign id
bg_event: MACRO bg_event: MACRO
db \2, \1, \3 db \2, \1, \3
{_NUM_BG_EVENTS} = {_NUM_BG_EVENTS} + 1 {_NUM_BG_EVENTS} += 1
ENDM ENDM
;\1 source map ;\1 source map
@ -101,7 +101,7 @@ _cur_bit = CURRENT_TRAINER_BIT % 8
db \2 << 4 db \2 << 4
dw wEventFlags + (\1 - CURRENT_TRAINER_BIT) / 8 dw wEventFlags + (\1 - CURRENT_TRAINER_BIT) / 8
dw \3, \5, \4, \4 dw \3, \5, \4, \4
CURRENT_TRAINER_BIT = CURRENT_TRAINER_BIT + 1 CURRENT_TRAINER_BIT += 1
ENDM ENDM
;\1 x position ;\1 x position

2
sram.asm
View file

@ -27,7 +27,7 @@ sMainDataCheckSum:: db
box_n = 0 box_n = 0
boxes: MACRO boxes: MACRO
REPT \1 REPT \1
box_n = box_n + 1 box_n += 1
sBox{d:box_n}:: ds wBoxDataEnd - wBoxDataStart sBox{d:box_n}:: ds wBoxDataEnd - wBoxDataStart
ENDR ENDR
ENDM ENDM