summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorM <No Email>2018-01-06 14:55:38 +0100
committerM <No Email>2018-01-06 14:55:38 +0100
commit842ffa33b3964d43a896be4f9248c33200b7137a (patch)
treec73c383ffe6ea0ee99e76b8da16457bd3e14218f /src
parente9bb490023f346697b4f432a9add1fe158f2038d (diff)
fix indents and build, remove diff.sh
Diffstat (limited to 'src')
-rw-r--r--src/roulette.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/src/roulette.c b/src/roulette.c
index 36c15bf23..1d612d071 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -1,8 +1,7 @@
#include "global.h"
-
#include "ewram.h"
#include "field_fadetransition.h"
-#include "game_stat.h"
+#include "constants/game_stat.h"
#include "m4a.h"
#include "main.h"
#include "menu.h"
@@ -11,14 +10,13 @@
#include "overworld.h"
#include "palette.h"
#include "pokemon.h"
-#include "rng.h"
#include "roulette.h"
#include "roulette_util.h"
#include "rtc.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "script.h"
-#include "species.h"
+#include "constants/species.h"
#include "sprite.h"
#include "strings2.h"
#include "string_util.h"
@@ -29,14 +27,6 @@
asm(".include \"constants/gba_constants.inc\"");
-struct OamMatrix
-{
- s16 a;
- s16 b;
- s16 c;
- s16 d;
-};
-
struct Roulette /* ewram + 0x19000 */
{
u8 var00;