Merge remote-tracking branch 'marijn/clean/headers'

1 files changed, 16 insertions, 13 deletions

diff --git a/src/rom4.c b/src/rom4.c
index 98060c3b1..2ddd5ed9f 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -1,24 +1,31 @@
 #include "global.h"
 #include "rom4.h"
-#include "asm.h"
-#include "asm_fieldmap.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"
@@ -26,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
@@ -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;
@@ -71,8 +78,6 @@ extern void (*gFieldCallback)(void);
 extern u8 gUnknown_03004860;
 extern u8 gFieldLinkPlayerCount;
 
-extern struct UnkTVStruct gUnknown_03004870;
-
 extern u16 gUnknown_03004898;
 extern u16 gUnknown_0300489C;
 
@@ -97,8 +102,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 *);
@@ -567,7 +570,7 @@ void sub_8053994(u32 a1)
     not_trainer_hill_battle_pyramid();
     if (a1 != 1 && v3)
     {
-        UpdateTVScreensOnMap(gUnknown_03004870.tv_field_0, gUnknown_03004870.tv_field_4);
+        UpdateTVScreensOnMap(gUnknown_03004870.width, gUnknown_03004870.height);
         sub_80BBCCC(1);
     }
 }