Event Actor docs that kind of ballooned into a bunch of stuff (#200)

* stuff

* too much

* Torch commit

* torch again

3 files changed, 106 insertions, 106 deletions

diff --git a/linker_scripts/us/symbol_addrs_audio.txt b/linker_scripts/us/symbol_addrs_audio.txt
index 55b4a144..865e8cb1 100644
--- a/linker_scripts/us/symbol_addrs_audio.txt
+++ b/linker_scripts/us/symbol_addrs_audio.txt
@@ -7,22 +7,22 @@ gSoundFontTableInitEntries = 0x800C3AA0;
 gSeqFontTableInit = 0x800C3CB0;
 
 // data
-gSamplesPerWavePeriod = 0x800C57E8; // size:4
-
-gChannelsPerBank = 0x800C5CE0; //type:u8 size:0x1C
-gUsedChannelsPerBank = 0x800C5CFC; //type:u8 size:0x1C
-gSfxRequestWriteIndex = 0x800C5D18;
-gSfxRequestReadIndex = 0x800C5D1C;
-gSfxChannelLayout = 0x800C5D20;
-D_800C5D24 = 0x800C5D24;
+sSamplesPerWavePeriod = 0x800C57E8; // size:4
+
+sChannelsPerBank = 0x800C5CE0; //type:u8 size:0x1C
+sUsedChannelsPerBank = 0x800C5CFC; //type:u8 size:0x1C
+sSfxRequestWriteIndex = 0x800C5D18;
+sSfxRequestReadIndex = 0x800C5D1C;
+sSfxChannelLayout = 0x800C5D20;
+sChannelMuteFlags = 0x800C5D24;
 gDefaultSfxSource = 0x800C5D28;
 gDefaultMod = 0x800C5D34;
 gDefaultReverb = 0x800C5D3C;
-gAudioFrameCounter = 0x800C5D40;
-gSeqCmdWritePos = 0x800C5D44;
-gSeqCmdReadPos = 0x800C5D48;
-gStartSeqDisabled = 0x800C5D4C;
-gSoundModeList = 0x800C5D50;
+sAudioFrameCounter = 0x800C5D40;
+sSeqCmdWritePos = 0x800C5D44;
+sSeqCmdReadPos = 0x800C5D48;
+sStartSeqDisabled = 0x800C5D4C;
+sSoundModeList = 0x800C5D50;
 sNewAudioSpecId = 0x800C5D54;
 D_800C5D58 = 0x800C5D58;
 
@@ -34,14 +34,14 @@ D_800C5E38 = 0x800C5E38;
 D_800C5E58 = 0x800C5E58;
 
 D_800C5E70 = 0x800C5E70;
-gSfxFreqMod = 0x800C5E74;
-gSfxVolMod = 0x800C5E78;
-gPlaylistIndex = 0x800C5E7C;
-gPlaylistTimer = 0x800C5E80;
-gPlaylistCmdIndex = 0x800C5E84;
+sSfxFreqMod = 0x800C5E74;
+sSfxVolMod = 0x800C5E78;
+sPlaylistIndex = 0x800C5E7C;
+sPlaylistTimer = 0x800C5E80;
+sPlaylistCmdIndex = 0x800C5E84;
 D_800C5E88 = 0x800C5E88;
-D_800C5EE4 = 0x800C5EE4;
-gPlaylists = 0x800C5FF4; //type:u16 size:5000
+sSoundTestTracks = 0x800C5EE4;
+sPlaylists = 0x800C5FF4; //type:u16 size:5000
 
 D_800C7380 = 0x800C7380;
 D_800C7384 = 0x800C7384;
@@ -93,28 +93,28 @@ D_80146D80 = 0x80146D80;
 
 gSlowLoads = 0x80146D90; // size:0xC4
 
-gSfxRequests = 0x80146E60;
-gSfxBanks = 0x80148660; //size:0x12C0
-gSfxBankListEnd = 0x80149920;
-gSfxBankFreeListStart = 0x80149928;
-gSfxBankUnused = 0x80149930;
-gActiveSfx = 0x80149938;
-gCurSfxPlayerChannelIndex = 0x80149A78;
-gSfxBankMuted = 0x80149A7C;
-gSfxVolumeMods = 0x80149A88;
+sSfxRequests = 0x80146E60;
+sSfxBanks = 0x80148660; //size:0x12C0
+sSfxBankListEnd = 0x80149920;
+sSfxBankFreeListStart = 0x80149928;
+sSfxBankUnused = 0x80149930;
+sActiveSfx = 0x80149938;
+sCurSfxPlayerChannelIndex = 0x80149A78;
+sSfxBankMuted = 0x80149A7C;
+sSfxVolumeMods = 0x80149A88;
 D_80149AD8 = 0x80149AD8;
 D_80149ED8 = 0x80149ED8;
 D_8014A2D8 = 0x8014A2D8;
 D_8014A8D8 = 0x8014A8D8;
 D_8014A958 = 0x8014A958;
-gSeqRequests = 0x8014A978;
-gNumSeqRequests = 0x8014A9A0;
-gAudioSeqCmds = 0x8014A9A8;
-gActiveSequences = 0x8014ADA8; //size:0x960
-gDelayedSeqCmdFlags = 0x8014B708;
-gDelayedSeqCmds = 0x8014B710;
-gSfxChannelState = 0x8014B790;
-gPlayerNoise = 0x8014B850;
+sSeqRequests = 0x8014A978;
+sNumSeqRequests = 0x8014A9A0;
+sAudioSeqCmds = 0x8014A9A8;
+sActiveSequences = 0x8014ADA8; //size:0x960
+sDelayedSeqCmdFlags = 0x8014B708;
+sDelayedSeqCmds = 0x8014B710;
+sSfxChannelState = 0x8014B790;
+sPlayerNoise = 0x8014B850;
 D_8014BA10 = 0x8014BA10;
 D_8014BA20 = 0x8014BA20;
 D_8014BA24 = 0x8014BA24;
@@ -480,8 +480,8 @@ func_8001D0B4 = 0x8001D0B4;
 func_8001D10C = 0x8001D10C;
 func_8001D15C = 0x8001D15C;
 func_8001D1C8 = 0x8001D1C8;
-func_8001D2FC = 0x8001D2FC;
-func_8001D3A0 = 0x8001D3A0;
+Audio_PlayEventSfx = 0x8001D2FC;
+Audio_StopEventSfx = 0x8001D3A0;
 Audio_SetBaseSfxReverb = 0x8001D400;
 Audio_SetBgmParam = 0x8001D410;
 Audio_PlaySequence = 0x8001D444;
diff --git a/linker_scripts/us/symbol_addrs_engine.txt b/linker_scripts/us/symbol_addrs_engine.txt
index f0d08cb3..b937f0b4 100644
--- a/linker_scripts/us/symbol_addrs_engine.txt
+++ b/linker_scripts/us/symbol_addrs_engine.txt
@@ -170,14 +170,14 @@ func_edisplay_800597C0 = 0x800597C0;
 Graphics_SetScaleMtx = 0x8005980C;
 func_edisplay_80059850 = 0x80059850;
 func_edisplay_800598DC = 0x800598DC;
-func_edisplay_800598E8 = 0x800598E8;
+Actor201_Draw = 0x800598E8;
 func_edisplay_800599A4 = 0x800599A4;
-func_edisplay_80059A24 = 0x80059A24;
-func_edisplay_80059AEC = 0x80059AEC;
+Actor202_Draw = 0x80059A24;
+Obj39_Draw = 0x80059AEC;
 func_edisplay_80059B20 = 0x80059B20;
 func_edisplay_80059BB0 = 0x80059BB0;
-func_edisplay_80059BBC = 0x80059BBC;
-func_edisplay_80059BF0 = 0x80059BF0;
+Obj42_Draw = 0x80059BBC;
+Actor196_Draw = 0x80059BF0;
 func_edisplay_80059C28 = 0x80059C28;
 func_edisplay_80059C34 = 0x80059C34;
 func_edisplay_80059C40 = 0x80059C40;
@@ -186,7 +186,7 @@ func_edisplay_80059FDC = 0x80059FDC;
 func_edisplay_8005A010 = 0x8005A010;
 func_edisplay_8005A07C = 0x8005A07C;
 func_edisplay_8005A088 = 0x8005A088;
-func_edisplay_8005A094 = 0x8005A094;
+Actor189_Draw = 0x8005A094;
 func_edisplay_8005ADAC = 0x8005ADAC;
 func_edisplay_8005B1E8 = 0x8005B1E8;
 func_edisplay_8005B388 = 0x8005B388;
@@ -198,27 +198,27 @@ func_edisplay_8005B9A4 = 0x8005B9A4;
 func_edisplay_8005BA30 = 0x8005BA30;
 func_edisplay_8005BAAC = 0x8005BAAC;
 func_edisplay_8005BAB4 = 0x8005BAB4;
-func_edisplay_8005C5F0 = 0x8005C5F0;
-func_edisplay_8005C900 = 0x8005C900;
-func_edisplay_8005C9C0 = 0x8005C9C0;
-func_edisplay_8005CA80 = 0x8005CA80;
-func_edisplay_8005CB44 = 0x8005CB44;
-func_edisplay_8005CC9C = 0x8005CC9C;
-func_edisplay_8005CDA8 = 0x8005CDA8;
+ItemCheckpoint_Draw = 0x8005C5F0;
+ItemSilverRing_Draw = 0x8005C900;
+ItemSilverStar_Draw = 0x8005C9C0;
+ItemGoldRing_Draw = 0x8005CA80;
+ItemBomb_Draw = 0x8005CB44;
+ItemLasers_Draw = 0x8005CC9C;
+ItemMeteoWarp_Draw = 0x8005CDA8;
 func_edisplay_8005D008 = 0x8005D008;
 func_edisplay_8005D1F0 = 0x8005D1F0;
 func_edisplay_8005D3CC = 0x8005D3CC;
 Object_80_Draw = 0x8005D654;
 Object_4C_Draw = 0x8005D8B8;
-Actor_Draw2 = 0x8005D954;
-Actor_Draw1 = 0x8005DBC0;
+Actor_DrawOnRails = 0x8005D954;
+Actor_DrawAllRange = 0x8005DBC0;
 Boss_Draw = 0x8005E1B8;
-Effect_Draw1 = 0x8005E454;
-Effect_Draw2 = 0x8005E538;
+Effect_DrawOnRails = 0x8005E454;
+Effect_DrawAllRange = 0x8005E538;
 Item_Draw = 0x8005E7B8;
 func_edisplay_8005EA24 = 0x8005EA24;
 func_edisplay_8005ECD8 = 0x8005ECD8;
-func_edisplay_8005F030 = 0x8005F030;
+Object_ClampSfxSource = 0x8005F030;
 func_edisplay_8005F0E8 = 0x8005F0E8;
 func_edisplay_8005F1EC = 0x8005F1EC;
 func_edisplay_8005F290 = 0x8005F290;
@@ -226,11 +226,11 @@ Object_58_Draw = 0x8005F2F4;
 func_edisplay_8005F670 = 0x8005F670;
 func_edisplay_8005F9DC = 0x8005F9DC;
 Object_DrawAll = 0x8005FB70;
-func_edisplay_8006046C = 0x8006046C;
-func_edisplay_80060714 = 0x80060714;
-func_edisplay_8006089C = 0x8006089C;
+Effect_DrawAll = 0x8006046C;
+Object_Draw = 0x80060714;
+Effect_Draw = 0x8006089C;
 TexturedLine_Draw = 0x80060968;
-func_edisplay_80060D94 = 0x80060D94;
+TexturedLine_DrawPath = 0x80060D94;
 
 // fox_effect
 BonusText_Display = 0x80077240;
@@ -315,22 +315,22 @@ func_enmy_80066EF0 = 0x80066EF0;
 func_enmy_800671D0 = 0x800671D0;
 func_enmy_80067348 = 0x80067348;
 func_enmy_800674B4 = 0x800674B4;
-func_enmy_8006753C = 0x8006753C;
-func_enmy_80067874 = 0x80067874;
+ActorSupplies_Update = 0x8006753C;
+ActorSupplies_Draw = 0x80067874;
 func_enmy_80067A40 = 0x80067A40;
-func_enmy_80067B1C = 0x80067B1C;
-func_enmy_80067BEC = 0x80067BEC;
-func_enmy_80067F6C = 0x80067F6C;
-func_enmy_80068020 = 0x80068020;
-func_enmy_800685D8 = 0x800685D8;
-func_enmy_800685F8 = 0x800685F8;
-func_enmy_80068618 = 0x80068618;
-func_enmy_80068688 = 0x80068688;
-func_enmy_80068914 = 0x80068914;
+Item1up_Update = 0x80067B1C;
+ItemPickup_Update = 0x80067BEC;
+ItemLasers_Update = 0x80067F6C;
+ItemSupplyRing_Update = 0x80068020;
+ItemSilverStar_Update = 0x800685D8;
+ItemGoldRing_Update = 0x800685F8;
+ItemWingRepair_Update = 0x80068618;
+ItemMeteoWarp_Update = 0x80068688;
+ItemCheckpoint_Update = 0x80068914;
 func_enmy_80068C48 = 0x80068C48;
 func_enmy_80068C88 = 0x80068C88;
 func_enmy_80068FE0 = 0x80068FE0;
-func_enmy_800690D0 = 0x800690D0;
+Object_Dying = 0x800690D0;
 func_enmy_800693E8 = 0x800693E8;
 func_enmy_80069658 = 0x80069658;
 func_enmy_800696F8 = 0x800696F8;
@@ -368,10 +368,10 @@ D_game_80161A40 = 0x80161A40;
 D_game_80161A44 = 0x80161A44;
 D_game_800D2860 = 0x800D2860;
 D_game_800D2870 = 0x800D2870;
-D_game_800D2874 = 0x800D2874;
-D_game_800D2884 = 0x800D2884;
-D_game_800D2894 = 0x800D2894;
-D_game_800D28A4 = 0x800D28A4;
+sVsCameraULx = 0x800D2874;
+sVsCameraLRx = 0x800D2884;
+sVsCameraULy = 0x800D2894;
+sVsCameraLRy = 0x800D28A4;
 sOverlaySetups = 0x800D28B4;
 
 Game_Initialize = 0x800A18B0;
@@ -400,27 +400,27 @@ D_800D1AEC = 0x800D1AEC; //type:s32 size:0x1B0
 D_play_80161A50 = 0x80161A50;
 D_play_80161A54 = 0x80161A54;
 D_play_80161A5C = 0x80161A5C;
-D_play_Timer_80161A60 = 0x80161A60;
-D_play_80161A62 = 0x80161A62;
+gScreenFlashTimer = 0x80161A60;
+gDropHitCountItem = 0x80161A62;
 D_play_80161A64 = 0x80161A64;
 sEnvSettings = 0x80161A68;
 D_play_800D2F68 = 0x800D2F68; //type:u8
 
 // fox_context
-D_80161A70 = 0x80161A70;
-D_80161A74 = 0x80161A74;
-D_80161A78 = 0x80161A78;
-D_80161A7C = 0x80161A7C;
-D_80161A80 = 0x80161A80;
-D_80161A84 = 0x80161A84;
-D_80161A88 = 0x80161A88;
-D_80161A8C = 0x80161A8C;
+D_ctx_80161A70 = 0x80161A70;
+D_ctx_80161A74 = 0x80161A74;
+D_ctx_80161A78 = 0x80161A78;
+D_ctx_80161A7C = 0x80161A7C;
+D_ctx_80161A80 = 0x80161A80;
+D_ctx_80161A84 = 0x80161A84;
+D_ctx_80161A88 = 0x80161A88;
+D_ctx_80161A8C = 0x80161A8C;
 gGoldRingCount = 0x80161A90;
 gHitCount = 0x80161A98;
 gSavedHitCount = 0x80161A9C;
 gLifeCount = 0x80161AA0;
 gLaserStrength = 0x80161AA8;//size:0x10
-D_80161AB8 = 0x80161AB8;
+D_ctx_80161AB8 = 0x80161AB8;
 gObjects80 = 0x80161B00; //size:0x1900
 gObjects4C = 0x80163400; //size:0xBE0
 gActors = 0x80163FE0; //size:0xB130
@@ -489,8 +489,8 @@ D_ctx_801779A8 = 0x801779A8;
 gCsCamAtY = 0x801779B8;
 gCsCamAtZ = 0x801779C0;
 gChargeTimers = 0x801779C8;
-D_ctx_801779D8 = 0x801779D8;
-D_ctx_801779E8 = 0x801779E8;
+gPlayerCamEye = 0x801779D8;
+gPlayerCamAt = 0x801779E8;
 gExpertMode = 0x801779F8;
 D_Timer_80177A00 = 0x80177A00;
 D_ctx_80177A10 = 0x80177A10;//size:0x28
@@ -523,7 +523,7 @@ D_ctx_80177C50 = 0x80177C50;
 D_ctx_80177C58 = 0x80177C58;
 gSoundMode = 0x80177C74;
 gVolumeSettings = 0x80177C80;
-D_ctx_80177C90 = 0x80177C90;
+gBgmSeqId = 0x80177C90;
 D_ctx_80177C94 = 0x80177C94;
 gLevelType = 0x80177C98;
 D_ctx_80177C9C = 0x80177C9C;
@@ -619,8 +619,8 @@ D_ctx_80178430 = 0x80178430;
 D_ctx_80178440 = 0x80178440;
 D_ctx_80178444 = 0x80178444;
 D_ctx_80178448 = 0x80178448;
-D_ctx_8017847C = 0x8017847C;
-D_ctx_80178480 = 0x80178480;
+gCameraShakeY = 0x8017847C;
+gCameraShake = 0x80178480;
 D_ctx_80178488 = 0x80178488;
 D_ctx_801784A4 = 0x801784A4;
 D_ctx_801784AC = 0x801784AC;
diff --git a/linker_scripts/us/symbol_addrs_overlays.txt b/linker_scripts/us/symbol_addrs_overlays.txt
index d8b357c7..26f3c499 100644
--- a/linker_scripts/us/symbol_addrs_overlays.txt
+++ b/linker_scripts/us/symbol_addrs_overlays.txt
@@ -1,13 +1,13 @@
 Corneria_8018ED78 = 0x8018ED78;//segment:ovl_i1
 Corneria_8018EE84 = 0x8018EE84;//segment:ovl_i1
 Corneria_8018B0B4 = 0x8018B0B4;//segment:ovl_i1
-Corneria_801878D8 = 0x801878D8;//segment:ovl_i1
-Corneria_8018BE7C = 0x8018BE7C;//segment:ovl_i1
+Corneria_Boss292_Init = 0x801878D8;//segment:ovl_i1
+Corneria_Boss293_Init = 0x8018BE7C;//segment:ovl_i1
 Venom1_8019250C = 0x8019250C;//segment:ovl_i1
 Venom1_80192CB0 = 0x80192CB0;//segment:ovl_i1
 Venom1_80192EA4 = 0x80192EA4;//segment:ovl_i1
 Venom1_801933B4 = 0x801933B4;//segment:ovl_i1
-Venom1_801935CC = 0x801935CC;//segment:ovl_i1
+Venom1_Boss319_Init = 0x801935CC;//segment:ovl_i1
 Venom1_80194398 = 0x80194398;//segment:ovl_i1
 Venom1_801920F0 = 0x801920F0;//segment:ovl_i1
 D_i1_8019A04C = 0x8019A04C; // size:0xC type:s16 segment:ovl_i1
@@ -21,7 +21,7 @@ D_i1_8019A500 = 0x8019A500; // segment:ovl_i1 type:s16 size:0x44
 D_i1_8019B838 = 0x8019B838; // segment:ovl_i1 size:0x880
 
 Meteo_80187B08 = 0x80187B08;//segment:ovl_i2
-Meteo_80188A40 = 0x80188A40;//segment:ovl_i2
+Meteo_Boss297_Init = 0x80188A40;//segment:ovl_i2
 D_i2_80195D70 = 0x80195D70;//segment:ovl_i2
 D_i4_8019F168 = 0x8019F168; // type:Vec3f segment:ovl_i4
 D_i4_8019F18C = 0x8019F18C; // type:f32 size:0xC segment:ovl_i4
@@ -57,7 +57,7 @@ D_menu_801AF274 = 0x801AF274; // type:f32 size:0x18 force_migration:True segment
 
 Area6_801875E4 = 0x801875E4;//segment:ovl_i3
 Area6_80187704 = 0x80187704;//segment:ovl_i3
-Area6_80187754 = 0x80187754;//segment:ovl_i3
+Area6_BossA6_Init = 0x80187754;//segment:ovl_i3
 Area6_80187944 = 0x80187944;//segment:ovl_i3
 Area6_8018A1B0 = 0x8018A1B0;//segment:ovl_i3
 Area6_8018A2C4 = 0x8018A2C4;//segment:ovl_i3
@@ -69,7 +69,7 @@ Area6_8018C54C = 0x8018C54C;//segment:ovl_i3
 Zoness_801900FC = 0x801900FC;//segment:ovl_i3
 Zoness_801915A4 = 0x801915A4;//segment:ovl_i3
 Zoness_80191BB8 = 0x80191BB8;//segment:ovl_i3
-Zoness_801932AC = 0x801932AC;//segment:ovl_i3
+Zoness_BossZo_Init = 0x801932AC;//segment:ovl_i3
 Zoness_80193908 = 0x80193908;//segment:ovl_i3
 Zoness_80193A98 = 0x80193A98;//segment:ovl_i3
 Zoness_80193CC8 = 0x80193CC8;//segment:ovl_i3
@@ -88,7 +88,7 @@ Zoness_8019962C = 0x8019962C;//segment:ovl_i3
 Zoness_8019B1F0 = 0x8019B1F0;//segment:ovl_i3
 Zoness_8019B810 = 0x8019B810;//segment:ovl_i3
 Zoness_8019C200 = 0x8019C200;//segment:ovl_i3
-Zoness_8019D060 = 0x8019D060;//segment:ovl_i3
+Zoness_Actor247_Init = 0x8019D060;//segment:ovl_i3
 Solar_801A7930 = 0x801A7930;//segment:ovl_i3
 Aquas_801A9448 = 0x801A9448;//segment:ovl_i3
 Aquas_801A94EC = 0x801A94EC;//segment:ovl_i3
@@ -101,7 +101,7 @@ Aquas_801AFA5C = 0x801AFA5C;//segment:ovl_i3
 Aquas_801B0F88 = 0x801B0F88;//segment:ovl_i3
 Aquas_801B0FCC = 0x801B0FCC;//segment:ovl_i3
 Aquas_801B1008 = 0x801B1008;//segment:ovl_i3
-Aquas_801B10F8 = 0x801B10F8;//segment:ovl_i3
+Aquas_BossAq_Init = 0x801B10F8;//segment:ovl_i3
 Aquas_801B134C = 0x801B134C;//segment:ovl_i3
 Aquas_801B6344 = 0x801B6344;//segment:ovl_i3
 Aquas_801B638C = 0x801B638C;//segment:ovl_i3
@@ -155,7 +155,7 @@ D_i3_801C2768 = 0x801C2768; //segment:ovl_i3 size:0x38
 D_i3_801C27A0 = 0x801C27A0; //segment:ovl_i3 size:0x20
 
 Katina_80198594 = 0x80198594;//segment:ovl_i4
-Katina_80193CA4 = 0x80193CA4;//segment:ovl_i4
+Katina_Boss316_Init = 0x80193CA4;//segment:ovl_i4
 SectorZ_80199C60 = 0x80199C60;//segment:ovl_i4
 SectorZ_80199900 = 0x80199900;//segment:ovl_i4
 D_i4_801A03C0 = 0x801A03C0;//segment:ovl_i4
@@ -170,13 +170,13 @@ Titania_801990DC = 0x801990DC;//segment:ovl_i5
 Ground_801B6AEC = 0x801B6AEC;//segment:ovl_i5
 Titania_80189B80 = 0x80189B80;//segment:ovl_i5
 Titania_8018ADC4 = 0x8018ADC4;//segment:ovl_i5
-Titania_8018B96C = 0x8018B96C;//segment:ovl_i5
+Titania_Actor231_Init = 0x8018B96C;//segment:ovl_i5
 Titania_8018BFB0 = 0x8018BFB0;//segment:ovl_i5
 Titania_8018E3CC = 0x8018E3CC;//segment:ovl_i5
 Titania_8018E5E8 = 0x8018E5E8;//segment:ovl_i5
 Titania_8018EFF0 = 0x8018EFF0;//segment:ovl_i5
 Titania_8018F0D8 = 0x8018F0D8;//segment:ovl_i5
-Titania_8018FA48 = 0x8018FA48;//segment:ovl_i5
+Titania_Boss306_Init = 0x8018FA48;//segment:ovl_i5
 Macbeth_80199F8C = 0x80199F8C;//segment:ovl_i5
 Titania_80193B30 = 0x80193B30;//segment:ovl_i5
 Titania_80193DF0 = 0x80193DF0;//segment:ovl_i5
@@ -211,8 +211,8 @@ D_i5_801B814C = 0x801B814C;//size:0x14 segment:ovl_i5
 D_i5_801B7630 = 0x801B7630;//size:0x24 segment:ovl_i5
 
 Andross_801888F4 = 0x801888F4; //segment:ovl_i6
-SectorY_80197CC4 = 0x80197CC4; //segment:ovl_i6
-Andross_8018D16C = 0x8018D16C; //segment:ovl_i6
+SectorY_Boss314_Init = 0x80197CC4; //segment:ovl_i6
+Andross_Boss320_Init = 0x8018D16C; //segment:ovl_i6
 D_i6_801A68B0 = 0x801A68B0;//size:0x48 type:Vec3f segment:ovl_i6
 D_i6_801A68F8 = 0x801A68F8;//size:0xC type:f32 segment:ovl_i6
 D_i6_801A7F30 = 0x801A7F30; //segment:ovl_i6