diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-06 10:34:05 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-06 10:34:05 -0500 |
| commit | 4efb3e307cd6b4bf267ab0d509f8e5ab498f798e (patch) | |
| tree | cd405b6d1ca27c14bfbed4fd3c2fefe91be7ee33 /macros | |
| parent | 5db3bdd6551fad07066b669db1e44a6151aaa0b4 (diff) | |
Sync more with pokered
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/predef.asm | 4 | ||||
| -rw-r--r-- | macros/scripts/events.asm | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/macros/predef.asm b/macros/predef.asm index f4e7f609..d86582d1 100644 --- a/macros/predef.asm +++ b/macros/predef.asm @@ -30,7 +30,3 @@ ENDM db_tx_pre: MACRO db (\1_id - TextPredefs) / 2 + 1 ENDM - -predef_const: MACRO - const \1PredefID -ENDM diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 266ffdd1..72420091 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -62,15 +62,15 @@ event_byte = ((\2) / 8) ENDM -EventFlagAddressa: MACRO +EventFlagAddressA: MACRO event_byte = ((\1) / 8) ld [wEventFlags + event_byte], a - ENDM +ENDM -aEventFlagAddress: MACRO +AEventFlagAddress: MACRO event_byte = ((\1) / 8) ld a, [wEventFlags + event_byte] - ENDM +ENDM ;\1 = event index CheckEventHL: MACRO @@ -156,7 +156,7 @@ event_byte = ((\1) / 8) bit (\1) % 8, [hl] set (\1) % 8, [hl] - ENDM +ENDM CheckAndResetEventReuseHL: MACRO IF event_byte != ((\1) / 8) @@ -166,7 +166,7 @@ event_byte = ((\1) / 8) bit (\1) % 8, [hl] res (\1) % 8, [hl] - ENDM +ENDM ;\1 = event index @@ -519,7 +519,7 @@ event_byte = ((\1) / 8) pop bc ENDC ENDC - ENDM +ENDM ; for handling fixed event bits when events are inserted/removed ;\1 = event index |