Merge pull request #241 from ProjectRevoTPP/master

decompile fldeff_cut.c, script_pokemon_util_80C4BF0.c, document save.c, move data to C files, decompile the next 3 functions in item_use.c, and a lot of labeling

1 files changed, 7 insertions, 9 deletions

diff --git a/src/rom4.c b/src/rom4.c
index 37c6b84ad..9d7fec115 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -30,6 +30,10 @@
 #include "tileset_anim.h"
 #include "weather.h"
 #include "wild_encounter.h"
+#include "script_pokemon_80C4.h"
+#include "clock.h"
+#include "field_map_obj_helpers.h"
+#include "field_control_avatar.h"
 
 #ifdef SAPPHIRE
 #define LEGENDARY_MUSIC BGM_OOAME  // Heavy Rain
@@ -465,16 +469,10 @@ struct MapConnection *sub_8053818(u8 dir)
 
     if (connection == NULL)
         return NULL;
-
-    i = 0;
-
-    while (i < count)
-    {
-        if (connection->direction == dir)
+	
+	for(i = 0; i < count; i++, connection++)
+		if (connection->direction == dir)
             return connection;
-        i++;
-        connection++;
-    }
 
     return NULL;
 }