summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main.c b/src/main.c
index 5049c054..68204fd4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,13 +6,13 @@
#include "main.h"
#include "common.h"
-#include "functions.h"
#include "game.h"
#include "interrupts.h"
#include "message.h"
#include "save.h"
#include "screen.h"
#include "sound.h"
+#include "fade.h"
extern u32 gRand;
@@ -283,10 +283,9 @@ u32 CheckRegionOnScreen(u32 x0, u32 y0, u32 x1, u32 y1) {
* Iterate over array of AABBs and check if any fit on screen
*/
u32 CheckRegionsOnScreen(const u16* arr) {
- const u16* i;
- for (i = arr; *i != 0xff; i += 5) {
- if (CheckRegionOnScreen(i[1], i[2], i[3], i[4]))
- return *i;
+ for (; *arr != 0xff; arr += 5) {
+ if (CheckRegionOnScreen(arr[1], arr[2], arr[3], arr[4]))
+ return *arr;
}
return 0xff;
}