1 files changed, 123 insertions, 249 deletions

diff --git a/src/rom4.c b/src/rom4.c
index 15041cb39..4f3e35fea 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -1,16 +1,35 @@
 #include "global.h"
-#include "fieldmap.h"
+#include "rom4.h"
+#include "asm.h"
+#include "asm_fieldmap.h"
+#include "battle_setup.h"
+#include "berry.h"
+#include "field_camera.h"
+#include "field_effect.h"
+#include "field_map_obj.h"
+#include "field_message_box.h"
+#include "field_player_avatar.h"
+#include "event_data.h"
+#include "heal_location.h"
+#include "link.h"
+#include "load_save.h"
+#include "main.h"
+#include "menu.h"
+#include "new_game.h"
+#include "palette.h"
+#include "play_time.h"
+#include "rng.h"
+#include "safari_zone.h"
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
-#include "rng.h"
-#include "main.h"
-#include "palette.h"
-#include "text.h"
-#include "link.h"
-#include "sprite.h"
-#include "flag.h"
-#include "var.h"
+#include "start_menu.h"
+#include "task.h"
+#include "tileset_anim.h"
+#include "truck_scene.h"
+#include "weather.h"
+#include "wild_encounter.h"
+#include "metatile_behavior.h"
 
 #ifdef SAPPHIRE
 #define LEGENDARY_MUSIC BGM_OOAME  // Heavy Rain
@@ -18,58 +37,12 @@
 #define LEGENDARY_MUSIC BGM_HIDERI // Drought
 #endif
 
-struct UnkWarpStruct
-{
-    s8 mapGroup;
-    s8 mapNum;
-    s16 x, y;
-};
-
 struct UnkTVStruct
 {
     u32 tv_field_0;
     u32 tv_field_4;
 };
 
-struct UnkPlayerStruct
-{
-    u8 player_field_0;
-    u8 player_field_1;
-};
-
-struct UnkInputStruct
-{
-    u8 input_field_0;
-    u8 input_field_1;
-    u8 input_field_2;
-    u8 input_field_3;
-};
-
-struct UnkStruct_8054FF8_Substruct
-{
-    s16 x;
-    s16 y;
-    u8 field_8;
-};
-
-struct UnkStruct_8054FF8
-{
-    u8 a;
-    u8 b;
-    u8 c;
-    u8 d;
-    struct UnkStruct_8054FF8_Substruct sub;
-    u16 field_C;
-};
-
-struct LinkPlayerMapObject
-{
-    u8 active;
-    u8 linkPlayerId;
-    u8 mapObjId;
-    u8 mode;
-};
-
 struct UCoords32
 {
     u32 x, y;
@@ -101,25 +74,25 @@ extern struct UnkTVStruct gUnknown_03004870;
 extern u16 gUnknown_03004898;
 extern u16 gUnknown_0300489C;
 
-extern u8 gUnknown_0819FC74[];
+extern u8 EventScript_LeagueWhiteOut[];
 extern u8 gUnknown_0819FC9F[];
-extern u8 gUnknown_081A436F[];
-extern u8 gUnknown_081A4379[];
-extern u8 gUnknown_081A4383[];
-extern u8 gUnknown_081A439E[];
-extern u8 gUnknown_081A43B9[];
-extern u8 gUnknown_081A43D4[];
-extern u8 gUnknown_081A43F0[];
-extern u8 gUnknown_081A43FA[];
-extern u8 gUnknown_081A4418[];
-extern u8 gUnknown_081A442D[];
-extern u8 gUnknown_081A4442[];
-extern u8 gUnknown_081A4457[];
-extern u8 gUnknown_081A4479[];
-extern u8 gUnknown_081A4487[];
-extern u8 gUnknown_081A4495[];
-extern u8 gUnknown_081A44E5[];
-extern u8 gUnknown_081A44FE[];
+extern u8 SingleBattleColosseum_EventScript_1A436F[];
+extern u8 SingleBattleColosseum_EventScript_1A4379[];
+extern u8 DoubleBattleColosseum_EventScript_1A4383[];
+extern u8 DoubleBattleColosseum_EventScript_1A439E[];
+extern u8 DoubleBattleColosseum_EventScript_1A43B9[];
+extern u8 DoubleBattleColosseum_EventScript_1A43D4[];
+extern u8 TradeCenter_EventScript_1A43F0[];
+extern u8 TradeCenter_EventScript_1A43FA[];
+extern u8 RecordCorner_EventScript_1A4418[];
+extern u8 RecordCorner_EventScript_1A442D[];
+extern u8 RecordCorner_EventScript_1A4442[];
+extern u8 RecordCorner_EventScript_1A4457[];
+extern u8 TradeRoom_ReadTrainerCard1[];
+extern u8 TradeRoom_ReadTrainerCard2[];
+extern u8 TradeRoom_TooBusyToNotice[];
+extern u8 TradeRoom_PromptToCancelLink[];
+extern u8 TradeRoom_TerminateLink[];
 extern u8 gUnknown_081A4508[];
 
 extern struct UCoords32 gUnknown_0821664C[];
@@ -134,122 +107,10 @@ extern const struct WarpData gDummyWarpData;
 extern s32 gUnknown_0839ACE8;
 extern u32 gUnknown_08216694[];
 
-extern struct UnkWarpStruct *GetHealLocation(u8);
-extern u8 GetSav1Weather(void);
-extern void PlayerGetDestCoords(u16 *, u16 *);
-extern u8 sub_810D32C(void);
-extern u16 GetLocalWildMon(bool8 *);
-extern u16 GetMirageIslandMon(void);
-extern void ExecuteTruckSequence(void);
-extern void sub_8080B60(void);
-extern void sub_810CC80(void);
-extern void sub_8080AC4(void);
-extern void sub_8080A3C(void);
-extern void atk17_seteffectuser(void);
-extern void sub_80809B0(void);
-extern void sub_8080990(void);
-extern u8 sub_80BBB24(void);
-extern u16 MapGridGetMetatileBehaviorAt(int, int);
-extern u8 *sub_80682A8(void *, u8, u8);
-extern u8 *sub_8068E24(struct UnkStruct_8054FF8_Substruct *);
-extern bool8 MapGridIsImpassableAt(s16, s16);
-extern u8 ZCoordToPriority(u8);
-
-void sub_8053050(void);
-void warp_in(void);
-void sub_8053570(void);
-u8 sav1_map_get_light_level(void);
-u8 get_map_light_level_by_bank_and_number(s8, s8);
-bool8 is_light_level_1_2_3_5_or_6(u8);
-void sub_805363C(s8, s8, s8, s8, s8);
-void sub_807D874(u8);
-void sub_8082BD0(u16, u16);
-void player_avatar_init_params_reset(void);
-u8 TestPlayerAvatarFlags(u8);
-u8 player_get_direction_lower_nybble(void);
-u8 sub_8053B00(struct UnkPlayerStruct *playerStruct, u16, u8);
-u8 sub_8053B60(struct UnkPlayerStruct *playerStruct, u8, u16, u8);
-u8 MetatileBehavior_IsSurfableWaterOrUnderwater(u8);
-bool8 sub_8056F24(u8);
-bool8 sub_8056F08(u8);
-bool8 MetatileBehavior_IsDoor(u8);
-bool8 MetatileBehavior_IsSouthArrowWarp(u8);
-bool8 MetatileBehavior_IsNorthArrowWarp(u8);
-bool8 MetatileBehavior_IsWestArrowWarp(u8);
-bool8 MetatileBehavior_IsEastArrowWarp(u8);
-bool8 MetatileBehavior_IsLadder(u8);
-u16 cur_mapdata_block_role_at_screen_center_acc_to_sav1(void);
-bool32 sub_8053C44(void);
-void sub_8053C98(void);
-void sav1_reset_battle_music_maybe(void);
-void sub_8053F0C(void);
-u8 is_light_level_8_or_9(u8);
-void sub_8054164(void);
-void sub_8055354(void);
-void c2_overworld(void);
-void CB2_LoadMap2(void);
-void c2_80567AC(void);
-void c2_exit_to_overworld_2_link(void);
-void c2_exit_to_overworld_2_local(void);
-void FieldClearVBlankHBlankCallbacks(void);
-void SetFieldVBlankCallback(void);
-void VBlankCB_Field(void);
-bool32 sub_805483C(u8 *);
-bool32 sub_805493C(u8 *, u32);
-bool32 sub_8054A4C(u8 *);
-bool32 sub_8054A9C(u8 *a1);
-void do_load_map_stuff_loop(u8 *a1);
-void sub_8054BA8(void);
-void sub_8054C2C(void);
-void sub_8054C54(void);
-void sub_8054D4C(u32 a1);
-void sub_8054D90(void);
-void mli4_mapscripts_and_other(void);
-void sub_8054E20(void);
-void sub_8054E34(void);
-void sub_8054E60(void);
-void sub_8054E7C(void);
-void sub_8054E98(void);
-void sub_8054EC8(void);
-void sub_8054F48(void);
-void sub_8054F70(void);
-u16 sub_805530C(u16);
-void sub_8055340(u16 *);
-u16 sub_8055390(u32);
-u16 sub_80553E4(u32);
-u16 sub_8055408(u32);
-u16 sub_8055438(u32);
-bool32 sub_8055618(struct UnkStruct_8054FF8 *);
-bool32 sub_8055630(struct UnkStruct_8054FF8 *);
-u8 *sub_8055648(struct UnkStruct_8054FF8 *);
-bool32 sub_8055660(struct UnkStruct_8054FF8 *);
-u8 *sub_805568C(struct UnkStruct_8054FF8 *);
-u16 sub_8055758(u8 *);
-void sub_80557E8(void);
-void sub_80557F4(void);
-void sub_8055808(u8 *);
-void sub_8055824(void);
-void sub_8055840(u8 *);
-void sub_805585C(void);
-bool32 sub_8055870(void);
-void SpawnLinkPlayerMapObject(u8, s16, s16, u8);
-void InitLinkPlayerMapObjectPos(struct MapObject *, s16, s16);
-void sub_80555B0(int, int, struct UnkStruct_8054FF8 *);
-u8 sub_8055AE8(u8);
-void sub_8055B08(u8, u16 *, u16 *);
-u8 sub_8055B30(u8);
-u8 sub_8055B50(u8);
-u8 GetLinkPlayerIdAt(s16, s16);
-void sub_8055BFC(u8, u8);
-u8 npc_something3(u8, u8);
-u8 LinkPlayerDetectCollision(u8, u8, s16, s16);
-void CreateLinkPlayerSprite(u8);
-void SpriteCB_LinkPlayer(struct Sprite *);
-void sub_8056C50(u16, u16);
-
-void sub_8052F5C(void)
-{
-    ScriptContext2_RunNewScript(gUnknown_0819FC74);
+
+void DoWhiteOut(void)
+{
+    ScriptContext2_RunNewScript(EventScript_LeagueWhiteOut);
     gSaveBlock1.money /= 2;
     HealPlayerParty();
     sub_8053050();
@@ -307,14 +168,15 @@ void sub_805308C(void)
     sub_8134348();
 }
 
-void sub_80530AC(void)
+void ResetGameStats(void)
 {
     s32 i;
+
     for (i = 0; i < NUM_GAME_STATS; i++)
         gSaveBlock1.gameStats[i] = 0;
 }
 
-void sav12_xor_increment(u8 index)
+void IncrementGameStat(u8 index)
 {
     if (index < NUM_GAME_STATS)
     {
@@ -325,7 +187,7 @@ void sav12_xor_increment(u8 index)
     }
 }
 
-u32 sub_8053108(u8 index)
+u32 GetGameStat(u8 index)
 {
     if (index >= NUM_GAME_STATS)
         return 0;
@@ -333,7 +195,7 @@ u32 sub_8053108(u8 index)
     return gSaveBlock1.gameStats[index];
 }
 
-void sav12_xor_set(u8 index, u32 value)
+void SetGameStat(u8 index, u32 value)
 {
     if (index < NUM_GAME_STATS)
         gSaveBlock1.gameStats[index] = value;
@@ -515,9 +377,9 @@ void copy_saved_warp2_bank_and_enter_x_to_warp1(void)
 
 void sub_8053538(u8 a1)
 {
-    struct UnkWarpStruct *warp = GetHealLocation(a1);
+    const struct HealLocation *warp = GetHealLocation(a1);
     if (warp)
-        warp1_set(warp->mapGroup, warp->mapNum, -1, warp->x, warp->y);
+        warp1_set(warp->group, warp->map, -1, warp->x, warp->y);
 }
 
 void sub_8053570(void)
@@ -527,9 +389,9 @@ void sub_8053570(void)
 
 void sub_8053588(u8 a1)
 {
-    struct UnkWarpStruct *warp = GetHealLocation(a1);
+    const struct HealLocation *warp = GetHealLocation(a1);
     if (warp)
-        warp_set(&gSaveBlock1.warp3, warp->mapGroup, warp->mapNum, -1, warp->x, warp->y);
+        warp_set(&gSaveBlock1.warp3, warp->group, warp->map, -1, warp->x, warp->y);
 }
 
 void sub_80535C4(u16 a1, u16 a2)
@@ -589,12 +451,12 @@ void unref_sub_8053790(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y)
 
 void sub_80537CC(u8 a1)
 {
-    struct UnkWarpStruct *warp = GetHealLocation(a1);
+    const struct HealLocation *warp = GetHealLocation(a1);
     if (warp)
-        warp_set(&gSaveBlock1.warp1, warp->mapGroup, warp->mapNum, -1, warp->x, warp->y);
+        warp_set(&gSaveBlock1.warp1, warp->group, warp->map, -1, warp->x, warp->y);
 }
 
-void gpu_sync_bg_hide(void)
+void gpu_sync_bg_hide()
 {
     gSaveBlock1.warp1 = gSaveBlock1.warp2;
 }
@@ -651,12 +513,13 @@ bool8 sub_80538D0(u16 x, u16 y)
 void sub_80538F0(u8 mapGroup, u8 mapNum)
 {
     s32 i;
+
     warp1_set(mapGroup, mapNum, -1, -1, -1);
     sub_8053F0C();
     warp_shift();
     set_current_map_header_from_sav1_save_old_name();
     sub_8053154();
-    sub_806906C();
+    ClearTempFieldEventData();
     ResetCyclingRoadChallengeData();
     prev_quest_postbuffer_cursor_backup_reset();
     sub_8082BD0(mapGroup, mapNum);
@@ -669,13 +532,15 @@ void sub_80538F0(u8 mapGroup, u8 mapNum)
     not_trainer_hill_battle_pyramid();
     sub_8056D38(gMapHeader.mapData);
     apply_map_tileset2_palette(gMapHeader.mapData);
+
     for (i = 6; i < 12; i++)
         sub_807D874(i);
+
     sub_8072ED0();
     mapnumbers_history_shift_sav1_0_2_4_out();
     sub_8134394();
-    sub_808073C();
-    wild_encounter_reset_coro_args();
+    DoCurrentWeather();
+    ResetFieldTasksArgs();
     mapheader_run_script_with_tag_x5();
     AddMapNamePopUpWindowTask();
 }
@@ -687,9 +552,9 @@ void sub_8053994(u32 a1)
 
     set_current_map_header_from_sav1_save_old_name();
     sub_8053154();
-    v2 = is_light_level_1_2_3_5_or_6(gMapHeader.light);
-    v3 = is_light_level_8_or_9(gMapHeader.light);
-    sub_806906C();
+    v2 = is_light_level_1_2_3_5_or_6(gMapHeader.mapType);
+    v3 = is_light_level_8_or_9(gMapHeader.mapType);
+    ClearTempFieldEventData();
     ResetCyclingRoadChallengeData();
     prev_quest_postbuffer_cursor_backup_reset();
     sub_8082BD0(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
@@ -722,13 +587,13 @@ void walkrun_find_lowest_active_bit_in_bitfield(void)
 {
     gUnknown_02029810.player_field_1 = player_get_direction_lower_nybble();
 
-    if (TestPlayerAvatarFlags(2))
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE))
         gUnknown_02029810.player_field_0 = 2;
-    else if (TestPlayerAvatarFlags(4))
+    else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE))
         gUnknown_02029810.player_field_0 = 4;
-    else if (TestPlayerAvatarFlags(8))
+    else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
         gUnknown_02029810.player_field_0 = 8;
-    else if (TestPlayerAvatarFlags(0x10))
+    else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_4))
         gUnknown_02029810.player_field_0 = 16;
     else
         gUnknown_02029810.player_field_0 = 1;
@@ -754,7 +619,7 @@ u8 sub_8053B00(struct UnkPlayerStruct *playerStruct, u16 a2, u8 a3)
         return 16;
     if (MetatileBehavior_IsSurfableWaterOrUnderwater(a2) == 1)
         return 8;
-    if (sub_8053C44() != 1)
+    if (IsBikingAllowedByMap() != TRUE)
         return 1;
     if (playerStruct->player_field_0 == 2)
         return 2;
@@ -767,9 +632,9 @@ u8 sub_8053B60(struct UnkPlayerStruct *playerStruct, u8 a2, u16 a3, u8 a4)
 {
     if (FlagGet(SYS_CRUISE_MODE) && a4 == 6)
         return 4;
-    if (sub_8056F24(a3) == TRUE)
+    if (MetatileBehavior_IsDeepSouthWarp(a3) == TRUE)
         return 2;
-    if (sub_8056F08(a3) == TRUE || MetatileBehavior_IsDoor(a3) == TRUE)
+    if (MetatileBehavior_IsNonAnimDoor(a3) == TRUE || MetatileBehavior_IsDoor(a3) == TRUE)
         return 1;
     if (MetatileBehavior_IsSouthArrowWarp(a3) == TRUE)
         return 2;
@@ -792,20 +657,28 @@ u16 cur_mapdata_block_role_at_screen_center_acc_to_sav1(void)
     return MapGridGetMetatileBehaviorAt(gSaveBlock1.pos.x + 7, gSaveBlock1.pos.y + 7);
 }
 
-bool32 sub_8053C44(void)
+bool32 IsBikingAllowedByMap(void)
 {
+    // is player in cycling road entrance?
     if (gSaveBlock1.location.mapGroup == 29 && (gSaveBlock1.location.mapNum == 11 || gSaveBlock1.location.mapNum == 12))
         return TRUE;
-    if (gMapHeader.light == 8)
+
+    // is player indoor, in a secret base, or underwater?
+    if (gMapHeader.mapType == MAP_TYPE_INDOOR)
         return FALSE;
-    if (gMapHeader.light == 9)
+    if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE)
         return FALSE;
-    if (gMapHeader.light == 5)
+    if (gMapHeader.mapType == MAP_TYPE_UNDERWATER)
         return FALSE;
+	
+    // is player in SeafloorCavern_Room9?
     if (gSaveBlock1.location.mapGroup == 24 && gSaveBlock1.location.mapNum == 36)
         return FALSE;
+	
+    // is player in CaveOfOrigin_B4F?
     if (gSaveBlock1.location.mapGroup == 24 && gSaveBlock1.location.mapNum == 42)
         return FALSE;
+	
     return TRUE;
 }
 
@@ -862,7 +735,7 @@ bool16 sub_8053D30(struct WarpData *warp)
 
 bool16 sub_8053D6C(struct WarpData *warp)
 {
-    if (VarGet(16563))
+    if (VarGet(0x40B3))
         return FALSE;
     if (warp->mapGroup != 32)
         return FALSE;
@@ -935,7 +808,7 @@ void sub_8053E90(void)
             music = gSaveBlock1.battleMusic;
         else if (sav1_map_get_light_level() == 5)
             music = BGM_DEEPDEEP;
-        else if (TestPlayerAvatarFlags(8))
+        else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
             music = BGM_NAMINORI;
     }
 
@@ -963,12 +836,12 @@ void sub_8053F0C(void)
         {
             if (currentMusic == BGM_DEEPDEEP || currentMusic == BGM_NAMINORI)
                 return;
-            if (TestPlayerAvatarFlags(8))
+            if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
                 newMusic = BGM_NAMINORI;
         }
         if (newMusic != currentMusic)
         {
-            if (TestPlayerAvatarFlags(6))
+            if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
                 FadeOutAndFadeInNewMapMusic(newMusic, 4, 4);
             else
                 FadeOutAndPlayNewMapMusic(newMusic, 8);
@@ -993,7 +866,7 @@ void sub_8053FB0(u16 music)
 u8 is_warp1_light_level_8_or_9(void)
 {
     struct MapHeader *mapHeader = warp1_get_mapheader();
-    if (is_light_level_8_or_9(mapHeader->light) == TRUE)
+    if (is_light_level_8_or_9(mapHeader->mapType) == TRUE)
         return 2;
     else
         return 4;
@@ -1078,7 +951,7 @@ void sub_8054164(void)
 
 u8 get_map_light_level_by_bank_and_number(s8 mapGroup, s8 mapNum)
 {
-    return get_mapheader_by_bank_and_number(mapGroup, mapNum)->light;
+    return get_mapheader_by_bank_and_number(mapGroup, mapNum)->mapType;
 }
 
 u8 get_map_light_level_from_warp(struct WarpData *warp)
@@ -1237,7 +1110,7 @@ void CB2_NewGame(void)
     SetMainCallback2(c2_overworld);
 }
 
-void c2_whiteout(void)
+void CB2_WhiteOut(void)
 {
     u8 val;
     gMain.state++;
@@ -1246,7 +1119,7 @@ void c2_whiteout(void)
         FieldClearVBlankHBlankCallbacks();
         StopMapMusic();
         ResetSafariZoneFlag_();
-        sub_8052F5C();
+        DoWhiteOut();
         player_avatar_init_params_reset();
         ScriptContext1_Init();
         ScriptContext2_Disable();
@@ -1266,7 +1139,7 @@ void CB2_LoadMap(void)
     ScriptContext2_Disable();
     set_callback1(NULL);
     SetMainCallback2(sub_810CC80);
-    gMain.field_8 = CB2_LoadMap2;
+    gMain.savedCallback = CB2_LoadMap2;
 }
 
 void CB2_LoadMap2(void)
@@ -1395,16 +1268,16 @@ void CB2_ContinueSavedGame(void)
     ResetSafariZoneFlag_();
     sub_805338C();
     sub_8053198();
-    sub_806451C();
+    UnfreezeMapObjects();
     DoTimeBasedEvents();
     sub_805308C();
     sub_8055FC0();
     PlayTimeCounter_Start();
     ScriptContext1_Init();
     ScriptContext2_Disable();
-    if (sub_80479F8() == 1)
+    if (GetSecretBase2Field_9() == 1)
     {
-        sub_8047A04();
+        ClearSecretBase2Field_9();
         sub_8053778();
         warp_in();
         SetMainCallback2(CB2_LoadMap);
@@ -1550,7 +1423,7 @@ bool32 sub_805493C(u8 *a1, u32 a2)
         sub_8054814();
         sub_8054C54();
         SetUpWindowConfig(&gWindowConfig_81E6C3C);
-        InitMenuWindow((u8 *)&gWindowConfig_81E6CE4);
+        InitMenuWindow(&gWindowConfig_81E6CE4);
         (*a1)++;
         break;
     case 5:
@@ -1767,7 +1640,7 @@ void sub_8054D4C(u32 a1)
     sub_807C828();
     sub_8080750();
     if (!a1)
-        overworld_ensure_per_step_coros_running();
+        SetUpFieldTasks();
     mapheader_run_script_with_tag_x5();
 }
 
@@ -2286,12 +2159,13 @@ u8 *sub_805568C(struct UnkStruct_8054FF8 *a1)
     if (linkPlayerId != 4)
     {
         if (!a1->b)
-            return gUnknown_081A4495;
+            return TradeRoom_TooBusyToNotice;
         if (gUnknown_03000580[linkPlayerId] != 0x80)
-            return gUnknown_081A4495;
+            return TradeRoom_TooBusyToNotice;
         if (!sub_8083BF4(linkPlayerId))
-            return gUnknown_081A4479;
-        return gUnknown_081A4487;
+            return TradeRoom_ReadTrainerCard1;
+		else
+			return TradeRoom_ReadTrainerCard2;
     }
 
     return sub_80682A8(&unkStruct, a1->field_C, a1->d);
@@ -2299,29 +2173,29 @@ u8 *sub_805568C(struct UnkStruct_8054FF8 *a1)
 
 u16 sub_8055758(u8 *script)
 {
-    if (script == gUnknown_081A4383)
+    if (script == DoubleBattleColosseum_EventScript_1A4383)
         return 10;
-    if (script == gUnknown_081A439E)
+    if (script == DoubleBattleColosseum_EventScript_1A439E)
         return 9;
-    if (script == gUnknown_081A43B9)
+    if (script == DoubleBattleColosseum_EventScript_1A43B9)
         return 10;
-    if (script == gUnknown_081A43D4)
+    if (script == DoubleBattleColosseum_EventScript_1A43D4)
         return 9;
-    if (script == gUnknown_081A4418)
+    if (script == RecordCorner_EventScript_1A4418)
         return 10;
-    if (script == gUnknown_081A442D)
+    if (script == RecordCorner_EventScript_1A442D)
         return 9;
-    if (script == gUnknown_081A4442)
+    if (script == RecordCorner_EventScript_1A4442)
         return 10;
-    if (script == gUnknown_081A4457)
+    if (script == RecordCorner_EventScript_1A4457)
         return 9;
-    if (script == gUnknown_081A436F)
+    if (script == SingleBattleColosseum_EventScript_1A436F)
         return 10;
-    if (script == gUnknown_081A4379)
+    if (script == SingleBattleColosseum_EventScript_1A4379)
         return 9;
-    if (script == gUnknown_081A43F0)
+    if (script == TradeCenter_EventScript_1A43F0)
         return 10;
-    if (script == gUnknown_081A43FA)
+    if (script == TradeCenter_EventScript_1A43FA)
         return 9;
     return 0;
 }
@@ -2348,7 +2222,7 @@ void sub_8055808(u8 *script)
 void sub_8055824(void)
 {
     PlaySE(SE_WIN_OPEN);
-    ScriptContext1_SetupScript(gUnknown_081A44E5);
+    ScriptContext1_SetupScript(TradeRoom_PromptToCancelLink);
     ScriptContext2_Enable();
 }
 
@@ -2361,7 +2235,7 @@ void sub_8055840(u8 *script)
 
 void sub_805585C(void)
 {
-    ScriptContext1_SetupScript(gUnknown_081A44FE);
+    ScriptContext1_SetupScript(TradeRoom_TerminateLink);
     ScriptContext2_Enable();
 }