diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-04-23 16:35:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-23 16:35:47 -0400 |
| commit | 38cdad798dbae4a2820f4d4e61bc5b782e70ef47 (patch) | |
| tree | de7e01b62c621497846e4778291fe4f81151376e /macros | |
| parent | 2d3a94b7c4ba033bdbfa382611a18b71a68349d4 (diff) | |
| parent | 8a3c44fad3a1d3c4f6b65f34d4e17d9359969177 (diff) | |
Merge pull request #714 from Rangi42/master
Miscellaneous updates and corrections
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/code.asm | 2 | ||||
| -rw-r--r-- | macros/wram.asm | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/macros/code.asm b/macros/code.asm index 58d39aa00..c92e7132f 100644 --- a/macros/code.asm +++ b/macros/code.asm @@ -51,7 +51,7 @@ calc_sine_wave: MACRO ; input: a = a signed 6-bit value ; output: a = d * sin(a * pi/32) and %111111 - cp %100000 + cp %100000 jr nc, .negative\@ call .apply\@ ld a, h diff --git a/macros/wram.asm b/macros/wram.asm index abc7df48e..abaa7daaf 100644 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -238,6 +238,7 @@ link_battle_record: MACRO \1Wins:: dw \1Losses:: dw \1Draws:: dw +\1End:: ENDM trademon: MACRO |