Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sine_wave macro parameterizes table size, not frequency ("amplitude" was an incorrect comment)

Browse Source
This commit is contained in:
Rangi
2018-02-02 22:45:42 -05:00
parent f258ff8a41
commit 45373ec601
6 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/battle/battle_transition.asm
View File

@@ -789,7 +789,7 @@ StartTrainerBattle_DrawSineWave: ; 8c6f7 (23:46f7)
; 8c728 (23:4728) ; 8c728 (23:4728)
.sinewave ; 8c728 .sinewave ; 8c728
sine_wave $100 sine_wave 32
; 8c768 ; 8c768
StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768) StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)

2
engine/battle_anims/functions.asm
View File

@@ -4157,5 +4157,5 @@ BattleAnim_AbsCosinePrecise: ; ce778
; ce77f ; ce77f
BattleAnimSineWave: ; ce77f BattleAnimSineWave: ; ce77f
sine_wave $100 sine_wave 32
; ce7bf ; ce7bf

2
engine/events/celebi.asm
View File

@@ -281,7 +281,7 @@ CelebiEvent_Cosine: ; 49b3b (12:5b3b)
; 49b6e (12:5b6e) ; 49b6e (12:5b6e)
.sinewave ; 49b6e .sinewave ; 49b6e
sine_wave $100 sine_wave 32
; 49bae ; 49bae
GetCelebiSpriteTile: ; 49bae GetCelebiSpriteTile: ; 49bae

2
engine/routines/sine.asm
View File

@@ -45,4 +45,4 @@ _Sine:: ; 84d9
.sinewave ; 850b .sinewave ; 850b
; A $20-word table representing a sine wave. ; A $20-word table representing a sine wave.
; 90 degrees is index $10 at a base amplitude of $100. ; 90 degrees is index $10 at a base amplitude of $100.
sine_wave $100 sine_wave 32

2
engine/sprites.asm
View File

@@ -620,7 +620,7 @@ Sprites_Sine: ; 8e72c
; 8e75d ; 8e75d
.sinewave ; 8e75d .sinewave ; 8e75d
sine_wave $100 sine_wave 32
AnimateEndOfExpBar: ; 8e79d AnimateEndOfExpBar: ; 8e79d

34
macros/data.asm
View File

@@ -31,29 +31,29 @@ dbwww: MACRO
ENDM ENDM
dn: MACRO ; nybbles dn: MACRO ; nybbles
rept _NARG / 2 rept _NARG / 2
db ((\1) << 4) | (\2) db ((\1) << 4) | (\2)
shift shift
shift shift
endr endr
ENDM ENDM
dc: MACRO ; "crumbs" dc: MACRO ; "crumbs"
rept _NARG / 4 rept _NARG / 4
db ((\1) << 6) | ((\2) << 4) | ((\3) << 2) | (\4) db ((\1) << 6) | ((\2) << 4) | ((\3) << 2) | (\4)
shift shift
shift shift
shift shift
shift shift
endr endr
ENDM ENDM
dx: MACRO dx: MACRO
x = 8 * ((\1) - 1) x = 8 * ((\1) - 1)
rept \1 rept \1
db ((\2) >> x) & $ff db ((\2) >> x) & $ff
x = x + -8 x = x + -8
endr endr
ENDM ENDM
dt: MACRO ; three-byte (big-endian) dt: MACRO ; three-byte (big-endian)
@@ -69,17 +69,17 @@ bigdw: MACRO ; big-endian word
ENDM ENDM
dba: MACRO ; dbw bank, address dba: MACRO ; dbw bank, address
rept _NARG rept _NARG
dbw BANK(\1), \1 dbw BANK(\1), \1
shift shift
endr endr
ENDM ENDM
dab: MACRO ; dwb address, bank dab: MACRO ; dwb address, bank
rept _NARG rept _NARG
dwb \1, BANK(\1) dwb \1, BANK(\1)
shift shift
endr endr
ENDM ENDM
dba_pic: MACRO ; dbw bank, address dba_pic: MACRO ; dbw bank, address
@@ -112,19 +112,17 @@ ENDM
sine_wave: MACRO sine_wave: MACRO
; \1: amplitude
x = 0 x = 0
rept $20 rept \1
; Round up. dw (sin(x) + (sin(x) & $ff)) >> 8 ; round up
dw (sin(x) + (sin(x) & $ff)) >> 8 x = x + (32768.0 / \1) ; a circle has 65536.0 "degrees"
x = x + (\1) * $40000 endr
endr
ENDM ENDM
bcd: MACRO bcd: MACRO
rept _NARG rept _NARG
dn ((\1) % 100) / 10, (\1) % 10 dn ((\1) % 100) / 10, (\1) % 10
shift shift
endr endr
ENDM ENDM