From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 14:53:51 +0200
Subject: Add headers

---
 src/rom4.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'src/rom4.c')

diff --git a/src/rom4.c b/src/rom4.c
index 79ac6d769..be07e5867 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -1,7 +1,19 @@
+#include "field_specials.h"
+#include "fieldmap.h"
+#include "tv.h"
+#include "secret_base.h"
+#include "map_name_popup.h"
+#include "field_fadetransition.h"
+#include "fldeff_flash.h"
+#include "unknown_task.h"
+#include "cable_club.h"
+#include "field_ground_effect.h"
+#include "field_tasks.h"
+#include "rotating_gate.h"
+#include "field_screen_effect.h"
+#include "time_events.h"
 #include "global.h"
 #include "rom4.h"
-#include "asm.h"
-#include "asm_fieldmap.h"
 #include "battle_setup.h"
 #include "berry.h"
 #include "clock.h"
@@ -48,11 +60,6 @@ struct UnkTVStruct
     u32 tv_field_4;
 };
 
-struct UCoords32
-{
-    u32 x, y;
-};
-
 extern struct WarpData gUnknown_020297F0;
 extern struct WarpData gUnknown_020297F8;
 extern struct WarpData gUnknown_02029800;
@@ -97,8 +104,6 @@ extern u8 TradeRoom_PromptToCancelLink[];
 extern u8 TradeRoom_TerminateLink[];
 extern u8 gUnknown_081A4508[];
 
-extern struct UCoords32 gUnknown_0821664C[];
-
 extern u8 (*gUnknown_082166A0[])(struct LinkPlayerMapObject *, struct MapObject *, u8);
 extern u8 (*gUnknown_082166AC[])(struct LinkPlayerMapObject *, struct MapObject *, u8);
 extern void (*gUnknown_082166D8[])(struct LinkPlayerMapObject *, struct MapObject *);
-- 
cgit v1.2.3


From f26daa3d6954d2db3a7c44b79d319a7a084462c2 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 15:01:42 +0200
Subject: Sort includes

---
 src/rom4.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/rom4.c')

diff --git a/src/rom4.c b/src/rom4.c
index be07e5867..04071cedb 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -1,36 +1,31 @@
-#include "field_specials.h"
-#include "fieldmap.h"
-#include "tv.h"
-#include "secret_base.h"
-#include "map_name_popup.h"
-#include "field_fadetransition.h"
-#include "fldeff_flash.h"
-#include "unknown_task.h"
-#include "cable_club.h"
-#include "field_ground_effect.h"
-#include "field_tasks.h"
-#include "rotating_gate.h"
-#include "field_screen_effect.h"
-#include "time_events.h"
 #include "global.h"
 #include "rom4.h"
 #include "battle_setup.h"
 #include "berry.h"
+#include "cable_club.h"
 #include "clock.h"
 #include "event_data.h"
 #include "field_camera.h"
 #include "field_control_avatar.h"
 #include "field_effect.h"
+#include "field_fadetransition.h"
+#include "field_ground_effect.h"
 #include "field_map_obj.h"
 #include "field_map_obj_helpers.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
-#include "field_weather.h"
+#include "field_screen_effect.h"
 #include "field_special_scene.h"
+#include "field_specials.h"
+#include "field_tasks.h"
+#include "field_weather.h"
+#include "fieldmap.h"
+#include "fldeff_flash.h"
 #include "heal_location.h"
 #include "link.h"
 #include "load_save.h"
 #include "main.h"
+#include "map_name_popup.h"
 #include "menu.h"
 #include "metatile_behavior.h"
 #include "new_game.h"
@@ -38,14 +33,19 @@
 #include "play_time.h"
 #include "rng.h"
 #include "roamer.h"
+#include "rotating_gate.h"
 #include "safari_zone.h"
 #include "script.h"
 #include "script_pokemon_80C4.h"
+#include "secret_base.h"
 #include "songs.h"
 #include "sound.h"
 #include "start_menu.h"
 #include "task.h"
 #include "tileset_anim.h"
+#include "time_events.h"
+#include "tv.h"
+#include "unknown_task.h"
 #include "wild_encounter.h"
 
 #ifdef SAPPHIRE
-- 
cgit v1.2.3