Merge branch 'master' into slot_machine

include/fldeff.h

@@ -4,4 +4,4 @@
 // rock smash
 u8 oei_task_add(void);
 
-#endif // GUARD_FLDEFF_H
+#endif // GUARD_FLDEFF_H

include/scanline_effect.h

@@ -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