From fc899e1906a9a245e94dafa7c0da2ef1697b7335 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 5 Oct 2021 21:02:42 -0400 Subject: `warp_event` warp IDs start at 1, like in pokegold/pokecrystal --- macros/scripts/maps.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'macros') diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 6c895f9a..12bc3c77 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -41,9 +41,9 @@ ENDM ;\1 x position ;\2 y position ;\3 destination map (-1 = wLastMap) -;\4 destination warp id +;\4 destination warp id; starts at 1 (internally at 0) warp_event: MACRO - db \2, \1, \4, \3 + db \2, \1, \4 - 1, \3 _WARP_{d:{_NUM_WARP_EVENTS}}_X = \1 _WARP_{d:{_NUM_WARP_EVENTS}}_Y = \2 {_NUM_WARP_EVENTS} = {_NUM_WARP_EVENTS} + 1 -- cgit v1.3.1-sl0p From 157b593561382c77a6435a8f1fae64df6d7169e8 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 6 Nov 2021 13:24:19 -0400 Subject: Use `dn` for wave instrument samples, like pokecrystal --- audio/wave_instruments.asm | 10 +++++----- macros/data.asm | 27 ++++++++++++++++++--------- 2 files changed, 23 insertions(+), 14 deletions(-) (limited to 'macros') diff --git a/audio/wave_instruments.asm b/audio/wave_instruments.asm index 31e7d016..15376004 100644 --- a/audio/wave_instruments.asm +++ b/audio/wave_instruments.asm @@ -15,19 +15,19 @@ ; the graph of the wave ; the current instrument is copied to rWave_0--rWave_f .wave0 - db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11 + dn 0, 2, 4, 6, 8, 10, 12, 14, 15, 15, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 1, 1 .wave1 - db $02,$46,$8A,$CE,$EF,$FF,$FE,$EE,$DD,$CB,$A9,$87,$65,$43,$22,$11 + dn 0, 2, 4, 6, 8, 10, 12, 14, 14, 15, 15, 15, 15, 14, 14, 14, 13, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 2, 1, 1 .wave2 - db $13,$69,$BD,$EE,$EE,$FF,$FF,$ED,$DE,$FF,$FF,$EE,$EE,$DB,$96,$31 + dn 1, 3, 6, 9, 11, 13, 14, 14, 14, 14, 15, 15, 15, 15, 14, 13, 13, 14, 15, 15, 15, 15, 14, 14, 14, 14, 13, 11, 9, 6, 3, 1 .wave3 - db $02,$46,$8A,$CD,$EF,$FE,$DE,$FF,$EE,$DC,$BA,$98,$76,$54,$32,$10 + dn 0, 2, 4, 6, 8, 10, 12, 13, 14, 15, 15, 14, 13, 14, 15, 15, 14, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 .wave4 - db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10 + dn 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 13, 14, 14, 15, 7, 7, 15, 14, 14, 13, 12, 10, 8, 7, 6, 5, 4, 3, 2, 1, 0 ; duty 5 reads from sfx data .wave5 diff --git a/macros/data.asm b/macros/data.asm index eb5b5564..311c859f 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -39,24 +39,33 @@ ENDM ; Constant data (db, dw, dl) macros -dn: MACRO ; nybbles - db (\1 << 4 | \2) -ENDM - dbw: MACRO db \1 dw \2 ENDM -dba: MACRO - dbw BANK(\1), \1 -ENDM - dwb: MACRO dw \1 db \2 ENDM -dab: MACRO +dn: MACRO ; nybbles +REPT _NARG / 2 + db ((\1) << 4) | (\2) + SHIFT 2 +ENDR +ENDM + +dba: MACRO ; dbw bank, address +REPT _NARG + dbw BANK(\1), \1 + SHIFT +ENDR +ENDM + +dab: MACRO ; dwb address, bank +REPT _NARG dwb \1, BANK(\1) + SHIFT +ENDR ENDM -- cgit v1.3.1-sl0p From 865d37e02ad6af386e7f596659ebec12266be3ce Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Nov 2021 20:56:57 -0500 Subject: Use compound assignment operators --- constants/item_constants.asm | 2 +- data/trainers/move_choices.asm | 2 +- macros/asserts.asm | 8 ++++---- macros/const.asm | 10 +++++----- macros/data.asm | 2 +- macros/scripts/events.asm | 12 ++++++------ macros/scripts/maps.asm | 8 ++++---- sram.asm | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) (limited to 'macros') diff --git a/constants/item_constants.asm b/constants/item_constants.asm index d8a5910f..f3c71985 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -122,7 +122,7 @@ __tmhm_value__ = NUM_TMS + 1 add_tmnum: MACRO \1_TMNUM EQU __tmhm_value__ -__tmhm_value__ = __tmhm_value__ + 1 +__tmhm_value__ += 1 ENDM add_hm: MACRO diff --git a/data/trainers/move_choices.asm b/data/trainers/move_choices.asm index 2c3498af..66bc36e7 100644 --- a/data/trainers/move_choices.asm +++ b/data/trainers/move_choices.asm @@ -3,7 +3,7 @@ move_choices: MACRO db \# ; all args ENDC db 0 ; end -list_index = list_index + 1 +list_index += 1 ENDM ; move choice modification methods that are applied for each trainer class diff --git a/macros/asserts.asm b/macros/asserts.asm index 946add28..df2cdcd4 100644 --- a/macros/asserts.asm +++ b/macros/asserts.asm @@ -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 @@ -52,7 +52,7 @@ ENDM nybble: MACRO ASSERT 0 <= (\1) && (\1) < $10, "nybbles must be 0-15" 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 db CURRENT_NYBBLE_ARRAY_VALUE CURRENT_NYBBLE_ARRAY_VALUE = 0 @@ -86,8 +86,8 @@ ENDM dbit: MACRO 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_LENGTH = CURRENT_BIT_ARRAY_LENGTH + 1 +CURRENT_BIT_ARRAY_VALUE |= (\1) << (CURRENT_BIT_ARRAY_LENGTH % 8) +CURRENT_BIT_ARRAY_LENGTH += 1 IF CURRENT_BIT_ARRAY_LENGTH % 8 == 0 db CURRENT_BIT_ARRAY_VALUE CURRENT_BIT_ARRAY_VALUE = 0 diff --git a/macros/const.asm b/macros/const.asm index 3df9ecd8..afbde7bc 100644 --- a/macros/const.asm +++ b/macros/const.asm @@ -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 diff --git a/macros/data.asm b/macros/data.asm index 311c859f..1f3c87a0 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -24,7 +24,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 or HM move" ENDC diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index c7fdb484..a9b1c615 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -261,8 +261,8 @@ event_fill_start = event_start_byte + 1 event_fill_count = event_end_byte - event_start_byte - 1 IF ((\1) % 8) == 0 -event_fill_start = event_fill_start - 1 -event_fill_count = event_fill_count + 1 +event_fill_start -= 1 +event_fill_count += 1 ELSE ld a, [wEventFlags + event_start_byte] or $ff - ((1 << ((\1) % 8)) - 1) @@ -270,7 +270,7 @@ event_fill_count = event_fill_count + 1 ENDC IF ((\2) % 8) == 7 -event_fill_count = event_fill_count + 1 +event_fill_count += 1 ENDC 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 IF ((\1) % 8) == 0 -event_fill_start = event_fill_start - 1 -event_fill_count = event_fill_count + 1 +event_fill_start -= 1 +event_fill_count += 1 ELSE ld a, [wEventFlags + event_start_byte] and ~($ff - ((1 << ((\1) % 8)) - 1)) & $ff @@ -332,7 +332,7 @@ event_fill_count = event_fill_count + 1 ENDC IF ((\2) % 8) == 7 -event_fill_count = event_fill_count + 1 +event_fill_count += 1 ENDC IF event_fill_count == 1 diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 12bc3c77..bae8fd07 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -29,7 +29,7 @@ object_event: MACRO ELSE db \6 ENDC -{_NUM_OBJECT_EVENTS} = {_NUM_OBJECT_EVENTS} + 1 +{_NUM_OBJECT_EVENTS} += 1 ENDM def_warp_events: MACRO @@ -46,7 +46,7 @@ warp_event: MACRO db \2, \1, \4 - 1, \3 _WARP_{d:{_NUM_WARP_EVENTS}}_X = \1 _WARP_{d:{_NUM_WARP_EVENTS}}_Y = \2 -{_NUM_WARP_EVENTS} = {_NUM_WARP_EVENTS} + 1 +{_NUM_WARP_EVENTS} += 1 ENDM def_bg_events: MACRO @@ -60,7 +60,7 @@ ENDM ;\3 sign id bg_event: MACRO db \2, \1, \3 -{_NUM_BG_EVENTS} = {_NUM_BG_EVENTS} + 1 +{_NUM_BG_EVENTS} += 1 ENDM ;\1 source map @@ -101,7 +101,7 @@ _cur_bit = CURRENT_TRAINER_BIT % 8 db \2 << 4 dw wEventFlags + (\1 - CURRENT_TRAINER_BIT) / 8 dw \3, \5, \4, \4 -CURRENT_TRAINER_BIT = CURRENT_TRAINER_BIT + 1 +CURRENT_TRAINER_BIT += 1 ENDM ;\1 x position diff --git a/sram.asm b/sram.asm index a4c9a38c..776610c5 100644 --- a/sram.asm +++ b/sram.asm @@ -27,7 +27,7 @@ sMainDataCheckSum:: db box_n = 0 boxes: MACRO REPT \1 -box_n = box_n + 1 +box_n += 1 sBox{d:box_n}:: ds wBoxDataEnd - wBoxDataStart ENDR ENDM -- cgit v1.3.1-sl0p