Merge branch 'master' into slot_machine

This commit is contained in:
PikalaxALT
2019-05-22 21:40:32 -04:00
300 changed files with 16587 additions and 7005 deletions
+1 -1
View File
@@ -4,4 +4,4 @@
// rock smash
u8 oei_task_add(void);
#endif // GUARD_FLDEFF_H
#endif // GUARD_FLDEFF_H
+1 -1
View File
@@ -45,4 +45,4 @@ void ScanlineEffect_SetParams(struct ScanlineEffectParams);
void ScanlineEffect_InitHBlankDmaTransfer(void);
u8 ScanlineEffect_InitWave(u8 startLine, u8 endLine, u8 frequency, u8 amplitude, u8 delayInterval, u8 regOffset, bool8 a7);
#endif // GUARD_SCANLINE_EFFECT_H
#endif // GUARD_SCANLINE_EFFECT_H