1 files changed, 29 insertions, 26 deletions

diff --git a/src/rom4.c b/src/rom4.c
index 79ac6d769..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;
@@ -67,12 +74,10 @@ extern u16 (*gUnknown_03000584)(u32);
 extern u8 gUnknown_03000588;
 
 extern u16 word_3004858;
-extern void (*gUnknown_0300485C)(void);
+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);
     }
 }
@@ -1082,11 +1085,11 @@ void sub_80543DC(u16 (*a1)(u32))
 
 void sub_80543E8(void)
 {
-    if (gUnknown_0300485C)
-        gUnknown_0300485C();
+    if (gFieldCallback)
+        gFieldCallback();
     else
         mapldr_default();
-    gUnknown_0300485C = NULL;
+    gFieldCallback = NULL;
 }
 
 void CB2_NewGame(void)
@@ -1099,7 +1102,7 @@ void CB2_NewGame(void)
     PlayTimeCounter_Start();
     ScriptContext1_Init();
     ScriptContext2_Disable();
-    gUnknown_0300485C = ExecuteTruckSequence;
+    gFieldCallback = ExecuteTruckSequence;
     do_load_map_stuff_loop(&gMain.state);
     SetFieldVBlankCallback();
     set_callback1(c1_overworld);
@@ -1119,7 +1122,7 @@ void CB2_WhiteOut(void)
         player_avatar_init_params_reset();
         ScriptContext1_Init();
         ScriptContext2_Disable();
-        gUnknown_0300485C = sub_8080B60;
+        gFieldCallback = sub_8080B60;
         val = 0;
         do_load_map_stuff_loop(&val);
         SetFieldVBlankCallback();
@@ -1166,7 +1169,7 @@ void sub_8054534(void)
 void sub_8054588(void)
 {
     FieldClearVBlankHBlankCallbacks();
-    gUnknown_0300485C = sub_8080AC4;
+    gFieldCallback = sub_8080AC4;
     SetMainCallback2(c2_80567AC);
 }
 
@@ -1216,7 +1219,7 @@ void sub_805465C(void)
     sub_8054F70();
     set_callback1(sub_8055354);
     sub_80543DC(sub_8055390);
-    gUnknown_0300485C = sub_8080A3C;
+    gFieldCallback = sub_8080A3C;
     ScriptContext1_Init();
     ScriptContext2_Disable();
     c2_exit_to_overworld_2_switch();
@@ -1225,28 +1228,28 @@ void sub_805465C(void)
 void sub_805469C(void)
 {
     FieldClearVBlankHBlankCallbacks();
-    gUnknown_0300485C = atk17_seteffectuser;
+    gFieldCallback = atk17_seteffectuser;
     c2_exit_to_overworld_2_switch();
 }
 
 void sub_80546B8(void)
 {
     FieldClearVBlankHBlankCallbacks();
-    gUnknown_0300485C = sub_80809B0;
+    gFieldCallback = sub_80809B0;
     c2_exit_to_overworld_2_switch();
 }
 
 void c2_exit_to_overworld_1_continue_scripts_restart_music(void)
 {
     FieldClearVBlankHBlankCallbacks();
-    gUnknown_0300485C = sub_8080990;
+    gFieldCallback = sub_8080990;
     c2_exit_to_overworld_2_switch();
 }
 
 void sub_80546F0(void)
 {
     FieldClearVBlankHBlankCallbacks();
-    gUnknown_0300485C = sub_8080B60;
+    gFieldCallback = sub_8080B60;
     c2_exit_to_overworld_2_switch();
 }
 
@@ -1280,7 +1283,7 @@ void CB2_ContinueSavedGame(void)
     }
     else
     {
-        gUnknown_0300485C = sub_805470C;
+        gFieldCallback = sub_805470C;
         set_callback1(c1_overworld);
         c2_exit_to_overworld_2_switch();
     }