General docs (#269)

* fox_display.c DOCS

* PRINTF

* actor->destroy boolean

* corneria docs

* Boss->unk_04C to Boss->animFrame

* aCoGrangaWalkingAnim

* more corneria docs

* Spawner

* Spawner code refined

* Spawner description

* Actor Spawn guard

* Molar Rock (name by @inspectredc)

* more docs

* actor docs

* initial disassembly config for lodgenet

* correct vram addresses for lodgenet

* Actor Docs

* More actor docs

* more actor docs

* correction

* correction

* more actor docs

* Preliminary work for Effect documentation

* Change Init for Setup

* fox_play cleanup and defake

* fox_zo function names

* fox_so function renaming

* more object docs

* venom 1 actors

* actor docs

* some fox_bo docs

* some fox_fo corrections

* fox_ma obj->this

* fox_ma renamings

* fox_ma docs

* fox_ti Actors

* revert permuter settings to ido

* some renames on fox_andross.c

* fox_sy actors

* object names

* corrections

* some effect comments

* fix AudioTable struct and data to avoid UB

* uintptr_t in audio

* audio load changes

* event id enum usage in fox_sy

* clear padding in sPlaylists

* HUD_FoBase_ExplodeCs

* HUD

4 files changed, 109 insertions, 101 deletions

diff --git a/linker_scripts/ln/rev0/symbol_addrs.txt b/linker_scripts/ln/rev0/symbol_addrs.txt
new file mode 100644
index 00000000..5a0489c3
--- /dev/null
+++ b/linker_scripts/ln/rev0/symbol_addrs.txt
@@ -0,0 +1,8 @@
+// dma symbols
+gDmaTable = 0x8017DB20;
+dma_table_ROM_START = 0xE44F0; //defined:true
+audio_seq_ROM_START = 0xE4A90; //defined:true
+audio_bank_ROM_START = 0x11F780; //defined:true
+audio_table_ROM_START = 0x13D7A0; //defined:true
+ovl_ending = 0x00F02520; //defined:true
+ovl_unused = 0x00F025C0; //defined:true
\ No newline at end of file
diff --git a/linker_scripts/us/rev1/symbol_addrs_assets.txt b/linker_scripts/us/rev1/symbol_addrs_assets.txt
index f396714e..2aa0f73c 100644
--- a/linker_scripts/us/rev1/symbol_addrs_assets.txt
+++ b/linker_scripts/us/rev1/symbol_addrs_assets.txt
@@ -60,7 +60,7 @@ D_AQ_6002628 = 0x06002628;
 D_AQ_60260EC = 0x060260EC;
 D_AQ_60314AC = 0x060314AC;
 D_TI1_70067C4 = 0x70067C4;
-D_TI1_7006990 = 0x7006990;
+aTi1DesertCrawlerSkel = 0x7006990;
 D_TI1_7006F74 = 0x7006F74;
 D_TI1_7007130 = 0x7007130;
 D_TI1_7007234 = 0x7007234;
@@ -89,7 +89,7 @@ D_A6_6011910 = 0x6011910;
 D_A6_601B2B0 = 0x601B2B0;
 D_A6_6018BA0 = 0x6018BA0;
 D_A6_6028578 = 0x6028578;
-D_A6_6028454 = 0x6028454;
+aA6GorgonHitbox = 0x6028454;
 
 D_TITLE_60246F8 = 0x60246F8;
 D_TITLE_60338DC = 0x60338DC;
diff --git a/linker_scripts/us/rev1/symbol_addrs_engine.txt b/linker_scripts/us/rev1/symbol_addrs_engine.txt
index d3f16df6..0122f86a 100644
--- a/linker_scripts/us/rev1/symbol_addrs_engine.txt
+++ b/linker_scripts/us/rev1/symbol_addrs_engine.txt
@@ -170,14 +170,14 @@ Object_SetCullDirection = 0x800597C0;
 Graphics_SetScaleMtx = 0x8005980C;
 Sprite168_Draw = 0x80059850;
 Object_dummy_800598DC = 0x800598DC;
-Actor201_Draw = 0x800598E8;
-Actor202_PostLimbDraw = 0x800599A4;
-Actor202_Draw = 0x80059A24;
+MeteoBall_Draw = 0x800598E8;
+ActorHopBot_PostLimbDraw = 0x800599A4;
+ActorHopBot_Draw = 0x80059A24;
 MeteoTunnel_Draw = 0x80059AEC;
 Scenery_DrawTitaniaBones = 0x80059B20;
 func_edisplay_80059BB0 = 0x80059BB0;
 CoIBeam_Draw = 0x80059BBC;
-Actor196_Draw = 0x80059BF0;
+ActorMoleMissile_Draw = 0x80059BF0;
 func_edisplay_80059C28 = 0x80059C28;
 Sprite167_Draw = 0x80059C34;
 FogShadow_Draw = 0x80059C40;
@@ -190,12 +190,12 @@ ActorDebris_Draw = 0x8005A094;
 Actor_DrawEngineAndContrails = 0x8005ADAC;
 Actor_DrawEngineGlow = 0x8005B1E8;
 func_edisplay_8005B388 = 0x8005B388;
-Actor180_Draw = 0x8005B6A4;
-Actor182_Draw = 0x8005B71C;
-Actor186_Draw = 0x8005B7CC;
-Actor190_191_Draw = 0x8005B848;
-Actor192_Draw = 0x8005B9A4;
-Actor193_Draw = 0x8005BA30;
+MeMolarRock_Draw = 0x8005B6A4;
+MeMeteor2_Draw = 0x8005B71C;
+MeLaserCannon1_Draw = 0x8005B7CC;
+ActorMissileSeek_Draw = 0x8005B848;
+ActorSkibot_Draw = 0x8005B9A4;
+ActorRadar_Draw = 0x8005BA30;
 func_edisplay_8005BAAC = 0x8005BAAC;
 Object_SetShadowDL = 0x8005BAB4;
 ItemCheckpoint_Draw = 0x8005C5F0;
@@ -234,22 +234,22 @@ TexturedLine_DrawPath = 0x80060D94;
 
 // fox_effect
 BonusText_Display = 0x80077240;
-func_effect_8007783C = 0x8007783C;
+Effect_Load = 0x8007783C;
 func_effect_80079618 = 0x80079618;
-func_effect_8007A568 = 0x8007A568;
+Effect_Effect383_Spawn = 0x8007A568;
 Effect_SpawnTimedSfxAtPos = 0x8007A6F0;
-func_effect_8007A900 = 0x8007A900;
-func_effect_8007AFD0 = 0x8007AFD0;
-func_effect_8007B8F8 = 0x8007B8F8;
-func_effect_8007BC7C = 0x8007BC7C;
-func_effect_8007BFFC = 0x8007BFFC;
-func_effect_8007C120 = 0x8007C120;
+Effect_Effect359_Spawn = 0x8007A900;
+Effect_Effect382_Spawn = 0x8007AFD0;
+Effect_Effect364_Spawn = 0x8007B8F8;
+Effect_Effect362_Spawn = 0x8007BC7C;
+Effect386_Spawn1 = 0x8007BFFC;
+Effect_Effect390_Spawn = 0x8007C120;
 func_effect_8007D0E0 = 0x8007D0E0;
 func_effect_8007D2C8 = 0x8007D2C8;
 func_effect_8007EE68 = 0x8007EE68;
 func_effect_800815DC = 0x800815DC;
 func_effect_80081A8C = 0x80081A8C;
-func_effect_8008377C = 0x8008377C;
+Effect_Effect391_Spawn = 0x8008377C;
 
 // fox_enmy
 Object_PlayerSfx = 0x80060F30;
@@ -284,9 +284,9 @@ Object_CheckHitboxCollision = 0x80062DBC;
 Object_CheckSingleHitbox = 0x800631A8;
 Object_CheckPolyCollision = 0x8006326C;
 Object_CheckCollision = 0x8006351C;
-func_enmy_80063CAC = 0x80063CAC;
-func_enmy_80063D58 = 0x80063D58;
-func_enmy_80063E5C = 0x80063E5C;
+Actor_CoRadar_Init = 0x80063CAC;
+Scenery_Corneria_Init = 0x80063D58;
+Scenery_CoStoneArch_Init = 0x80063E5C;
 func_enmy_80063F4C = 0x80063F4C;
 func_enmy_80063F58 = 0x80063F58;
 func_enmy_80063F74 = 0x80063F74;
@@ -297,13 +297,13 @@ func_enmy_8006546C = 0x8006546C;
 func_enmy_800654E4 = 0x800654E4;
 func_enmy_800655C8 = 0x800655C8;
 func_enmy_8006566C = 0x8006566C;
-Actors190_191_Update = 0x800656D4;
+ActorMissileSeek_Update = 0x800656D4;
 func_enmy_800660F0 = 0x800660F0;
 Actor_Despawn = 0x80066254;
-Actor192_Update = 0x8006654C;
+ActorSkibot_Update = 0x8006654C;
 func_enmy_8006684C = 0x8006684C;
-Actor193_Update = 0x800669A0;
-Actor180_Update = 0x80066A80;
+ActorRadar_Update = 0x800669A0;
+MeMolarRock_Update = 0x80066A80;
 func_enmy_80066A8C = 0x80066A8C;
 func_enmy_80066C00 = 0x80066C00;
 CoBuilding9_Update = 0x80066D5C;
@@ -366,7 +366,7 @@ gGameStandby = 0x80161A39;
 gFovY = 0x80161A3C;
 gProjectNear = 0x80161A40;
 gProjectFar = 0x80161A44;
-gShowCrosshairs = 0x800D2860;
+gShowReticles = 0x800D2860;
 D_game_800D2870 = 0x800D2870;
 sVsCameraULx = 0x800D2874;
 sVsCameraLRx = 0x800D2884;
@@ -431,14 +431,14 @@ gPlayerShots = 0x80174050; //size:0x700
 gTexturedLines = 0x80174750; //size:0x12C0
 gRadarMarks = 0x80175A10; //size:0xA28
 gBonusText = 0x80176438; //size:0x118
-gActor194Status = 0x80176550;
-gActor194xPos = 0x80176558;
-gActor194yPos = 0x80176878;
-gActor194zPos = 0x80176B98;
-gActor194xRot = 0x80176EB8;
-gActor194yRot = 0x801771D8;
+gMeMoraStatus = 0x80176550;
+gMeMoraXpos = 0x80176558;
+gMeMoraYpos = 0x80176878;
+gMeMoraZpos = 0x80176B98;
+gMeMoraXrot = 0x80176EB8;
+gMeMoraYrot = 0x801771D8;
 gSceneId = 0x801774F8;
-gActor194zRot = 0x80177500;
+gMeMoraZrot = 0x80177500;
 gSceneSetup = 0x80177820;
 gClearPlayerInfo = 0x80177824;
 gEnemyShotSpeed = 0x80177828;
@@ -622,7 +622,7 @@ gBossDeathCamAtZ = 0x80178448;
 gCameraShakeY = 0x8017847C;
 gCameraShake = 0x80178480;
 gLoadLevelObjects = 0x80178488;
-gZOSnakeWaypointCount = 0x801784A4;
+gZoDodoraWaypointCount = 0x801784A4;
 gGroundType = 0x801784AC;
 gLight1xRot = 0x801784B8;
 gLight1yRot = 0x801784BC;
diff --git a/linker_scripts/us/rev1/symbol_addrs_overlays.txt b/linker_scripts/us/rev1/symbol_addrs_overlays.txt
index 1ceb0b8e..3e8124c4 100644
--- a/linker_scripts/us/rev1/symbol_addrs_overlays.txt
+++ b/linker_scripts/us/rev1/symbol_addrs_overlays.txt
@@ -1,14 +1,14 @@
-Corneria_Boss294_Draw = 0x8018ED78;//segment:ovl_i1
-Corneria_Boss295_Draw = 0x8018EE84;//segment:ovl_i1
-Corneria_IBeam_Init = 0x8018B0B4;//segment:ovl_i1
+Corneria_CoCarrierLeft_Draw = 0x8018ED78;//segment:ovl_i1
+Corneria_CoCarrierUpper_Draw = 0x8018EE84;//segment:ovl_i1
+Corneria_CoIBeam_Init = 0x8018B0B4;//segment:ovl_i1
 Corneria_Granga_Init = 0x801878D8;//segment:ovl_i1
-Corneria_Carrier_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_Boss319_Init = 0x801935CC;//segment:ovl_i1
-Venom1_Boss_Update = 0x80194398;//segment:ovl_i1
+Corneria_CoCarrier_Init = 0x8018BE7C;//segment:ovl_i1
+Venom1_Ve1Pillar1_Init = 0x8019250C;//segment:ovl_i1
+Venom1_Ve1Pillar2_3_Init = 0x80192CB0;//segment:ovl_i1
+Venom1_Ve1Pillar4_Init = 0x80192EA4;//segment:ovl_i1
+Venom1_Ve1MonkeyStatue_Init = 0x801933B4;//segment:ovl_i1
+Venom1_Ve1Golemech_Init = 0x801935CC;//segment:ovl_i1
+Venom1_Ve1Golemech_Update = 0x80194398;//segment:ovl_i1
 Venom1_801920F0 = 0x801920F0;//segment:ovl_i1
 D_i1_8019A04C = 0x8019A04C; // size:0xC type:s16 segment:ovl_i1
 D_i1_8019B6C0 = 0x8019B6C0;//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_Boss297_Init = 0x80188A40;//segment:ovl_i2
+Meteo_MeCrusher_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
@@ -55,25 +55,25 @@ D_menu_801AEE6C = 0x801AEE6C; // type:s32 size:0x58 force_migration:True segment
 D_menu_801AF25C = 0x801AF25C; // type:f32 size:0x18 force_migration:True segment:ovl_menu
 D_menu_801AF274 = 0x801AF274; // type:f32 size:0x18 force_migration:True segment:ovl_menu
 
-Area6_801875E4 = 0x801875E4;//segment:ovl_i3
-Area6_80187704 = 0x80187704;//segment:ovl_i3
-Area6_BossA6_Init = 0x80187754;//segment:ovl_i3
-Area6_Boss_Update = 0x80187944;//segment:ovl_i3
+Area6_ActorMissileSeekPlayer_Spawn = 0x801875E4;//segment:ovl_i3
+Area6_Effect395_Spawn = 0x80187704;//segment:ovl_i3
+Area6_A6Gorgon_Init = 0x80187754;//segment:ovl_i3
+Area6_A6Gorgon_Update = 0x80187944;//segment:ovl_i3
 Area6_8018A1B0 = 0x8018A1B0;//segment:ovl_i3
 Area6_8018A2C4 = 0x8018A2C4;//segment:ovl_i3
 Area6_8018A464 = 0x8018A464;//segment:ovl_i3
 Area6_8018B9BC = 0x8018B9BC;//segment:ovl_i3
 Area6_8018BCD4 = 0x8018BCD4;//segment:ovl_i3
 Area6_8018C0D0 = 0x8018C0D0;//segment:ovl_i3
-Area6_Boss_Draw = 0x8018C54C;//segment:ovl_i3
-Zoness_SpawnDebris = 0x801900FC;//segment:ovl_i3
-Zoness_801915A4 = 0x801915A4;//segment:ovl_i3
-Zoness_80191BB8 = 0x80191BB8;//segment:ovl_i3
-Zoness_BossZo_Init = 0x801932AC;//segment:ovl_i3
-Zoness_80193908 = 0x80193908;//segment:ovl_i3
-Zoness_80193A98 = 0x80193A98;//segment:ovl_i3
+Area6_A6Gorgon_Draw = 0x8018C54C;//segment:ovl_i3
+Zoness_ActorDebris_Spawn = 0x801900FC;//segment:ovl_i3
+Zoness_ZoEnergyBall_Init = 0x801915A4;//segment:ovl_i3
+Zoness_ZoEnergyBall_Init2 = 0x80191BB8;//segment:ovl_i3
+Zoness_ZoSarumarine_Init = 0x801932AC;//segment:ovl_i3
+Zoness_Effect394_Spawn = 0x80193908;//segment:ovl_i3
+Zoness_Effect394_Spawn2 = 0x80193A98;//segment:ovl_i3
 Zoness_80193CC8 = 0x80193CC8;//segment:ovl_i3
-Zoness_Boss_Update = 0x80194A84;//segment:ovl_i3
+Zoness_ZoSarumarine_Update = 0x80194A84;//segment:ovl_i3
 Zoness_801986FC = 0x801986FC;//segment:ovl_i3
 Zoness_801989FC = 0x801989FC;//segment:ovl_i3
 Zoness_80198BE8 = 0x80198BE8;//segment:ovl_i3
@@ -85,31 +85,31 @@ Zoness_801991D0 = 0x801991D0;//segment:ovl_i3
 Zoness_80199394 = 0x80199394;//segment:ovl_i3
 Zoness_80199470 = 0x80199470;//segment:ovl_i3
 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_Actor247_Init = 0x8019D060;//segment:ovl_i3
+Zoness_ZoCargoShip_Init = 0x8019B1F0;//segment:ovl_i3
+Zoness_ZoContainer_Init = 0x8019B810;//segment:ovl_i3
+Zoness_ZoSupplyCrane_Init = 0x8019C200;//segment:ovl_i3
+Zoness_ZoBarrier_Init = 0x8019D060;//segment:ovl_i3
 Solar_LevelComplete = 0x801A7930;//segment:ovl_i3
 Aquas_SpawnDebris = 0x801A9448;//segment:ovl_i3
-Aquas_801A94EC = 0x801A94EC;//segment:ovl_i3
+Aquas_SpawnItem = 0x801A94EC;//segment:ovl_i3
 Aquas_801A958C = 0x801A958C;//segment:ovl_i3
-Aquas_801AC8A8 = 0x801AC8A8;//segment:ovl_i3
-Aquas_801AD688 = 0x801AD688;//segment:ovl_i3
-Aquas_801AE3AC = 0x801AE3AC;//segment:ovl_i3
-Aquas_801AF9FC = 0x801AF9FC;//segment:ovl_i3
+Aquas_Effect366_Spawn = 0x801AC8A8;//segment:ovl_i3
+Aquas_Actor255_Init = 0x801AD688;//segment:ovl_i3
+Aquas_Actor256_Init = 0x801AE3AC;//segment:ovl_i3
+Aquas_Actor257_Init = 0x801AF9FC;//segment:ovl_i3
 Aquas_Actor257_Update = 0x801AFA5C;//segment:ovl_i3
 Aquas_801B0F88 = 0x801B0F88;//segment:ovl_i3
 Aquas_801B0FCC = 0x801B0FCC;//segment:ovl_i3
 Aquas_801B1008 = 0x801B1008;//segment:ovl_i3
-Aquas_BossAq_Init = 0x801B10F8;//segment:ovl_i3
-Aquas_Boss_Update = 0x801B134C;//segment:ovl_i3
-Aquas_801B6344 = 0x801B6344;//segment:ovl_i3
-Aquas_Actor259_Update = 0x801B638C;//segment:ovl_i3
-Aquas_801B6E54 = 0x801B6E54;//segment:ovl_i3
-Aquas_Actor262_Update = 0x801B6FF8;//segment:ovl_i3
-Aquas_801B7AF0 = 0x801B7AF0;//segment:ovl_i3
-Aquas_801BA57C = 0x801BA57C;//segment:ovl_i3
-Aquas_801BB26C = 0x801BB26C;//segment:ovl_i3
+Aquas_AqBacoon_Init = 0x801B10F8;//segment:ovl_i3
+Aquas_AqBacoon_Update = 0x801B134C;//segment:ovl_i3
+Aquas_AqAnglerFish_Init = 0x801B6344;//segment:ovl_i3
+Aquas_AqAnglerFish_Update = 0x801B638C;//segment:ovl_i3
+Aquas_AqSpindlyFish_Init = 0x801B6E54;//segment:ovl_i3
+Aquas_AqSpindlyFish_Update = 0x801B6FF8;//segment:ovl_i3
+Aquas_AqGaroa_Init = 0x801B7AF0;//segment:ovl_i3
+Venom1_AqBoulder_Init = 0x801BA57C;//segment:ovl_i3
+Venom1_AqJellyfish_Init = 0x801BB26C;//segment:ovl_i3
 D_i3_801C2240 = 0x801C2240;//segment:ovl_i3
 D_AQ_801C4188 = 0x801C4188;//segment:ovl_i3
 D_i3_801C2250 = 0x801C2250;//size:0xA0 segment:ovl_i3
@@ -141,7 +141,7 @@ D_i3_801C27C8 = 0x801C27C8; //segment:ovl_i3 size:0x12C0
 D_i3_801C3A88 = 0x801C3A88; //segment:ovl_i3 size:0x700
 D_i3_801C4190 = 0x801C4190; //segment:ovl_i3 size:0x28
 D_i3_801C41B8 = 0x801C41B8; //segment:ovl_i3 size:0x78
-sBossAQlimbTimers = 0x801C4230; //segment:ovl_i3 size:0x70
+sAqBacoonlimbTimers = 0x801C4230; //segment:ovl_i3 size:0x70
 D_i3_801C42A0 = 0x801C42A0; //segment:ovl_i3 size:0x68
 D_i3_801C4308 = 0x801C4308; //segment:ovl_i3 size:0x148
 D_i3_801C0060 = 0x801C0060; //segment:ovl_i3 type:f32
@@ -155,7 +155,7 @@ D_i3_801C2768 = 0x801C2768; //segment:ovl_i3 size:0x38
 D_i3_801C27A0 = 0x801C27A0; //segment:ovl_i3 size:0x20
 
 Katina_UpdateEvents = 0x80198594;//segment:ovl_i4
-Katina_BossSetup = 0x80193CA4;//segment:ovl_i4
+Katina_KaSaucerer_Init = 0x80193CA4;//segment:ovl_i4
 SectorZ_Missile_Update = 0x80199C60;//segment:ovl_i4
 SectorZ_MissileExplode = 0x80199900;//segment:ovl_i4
 D_i4_801A03C0 = 0x801A03C0;//segment:ovl_i4
@@ -165,29 +165,29 @@ D_BO_801A03DC = 0x801A03DC;//segment:ovl_i4
 
 Macbeth_801A55D4 = 0x801A55D4;//segment:ovl_i5
 Titania_8018E3B0 = 0x8018E3B0;//segment:ovl_i5
-Titania_8018B720 = 0x8018B720;//segment:ovl_i5
+Titania_TiRasco_Dying = 0x8018B720;//segment:ovl_i5
 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_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_Boss306_Init = 0x8018FA48;//segment:ovl_i5
-Macbeth_80199F8C = 0x80199F8C;//segment:ovl_i5
+Titania_TiFekuda_Init = 0x80189B80;//segment:ovl_i5
+Titania_TiRasco_Init = 0x8018ADC4;//segment:ovl_i5
+Titania_TiBomb_Init = 0x8018B96C;//segment:ovl_i5
+Titania_TiDesertCrawler_Init = 0x8018BFB0;//segment:ovl_i5
+Titania_TiDelphor_Init = 0x8018E3CC;//segment:ovl_i5
+Titania_TiDelphorHead_Init = 0x8018E5E8;//segment:ovl_i5
+Titania_TiCactus_Init = 0x8018EFF0;//segment:ovl_i5
+Titania_TiPillar_Init = 0x8018F0D8;//segment:ovl_i5
+Titania_TiGoras_Init = 0x8018FA48;//segment:ovl_i5
+Macbeth_Train_Init = 0x80199F8C;//segment:ovl_i5
 Titania_80193B30 = 0x80193B30;//segment:ovl_i5
 Titania_80193DF0 = 0x80193DF0;//segment:ovl_i5
 Titania_80190A08 = 0x80190A08;//segment:ovl_i5
-Macbeth_801A3E70 = 0x801A3E70;//segment:ovl_i5
-Macbeth_801A4660 = 0x801A4660;//segment:ovl_i5
-Macbeth_801A4AF8 = 0x801A4AF8;//segment:ovl_i5
-Macbeth_801A5E2C = 0x801A5E2C;//segment:ovl_i5
-Macbeth_801A6134 = 0x801A6134;//segment:ovl_i5
-Macbeth_801A65E0 = 0x801A65E0;//segment:ovl_i5
-Macbeth_801A7D98 = 0x801A7D98;//segment:ovl_i5
+Macbeth_MaMaRailroadSwitch_Init = 0x801A3E70;//segment:ovl_i5
+Macbeth_MaBoulder_Init = 0x801A4660;//segment:ovl_i5
+Macbeth_MaRailwaySignal_Init = 0x801A4AF8;//segment:ovl_i5
+Macbeth_LockBars_Init = 0x801A5E2C;//segment:ovl_i5
+Macbeth_MaBarrier_Init = 0x801A6134;//segment:ovl_i5
+Macbeth_MaProximityLight_Init = 0x801A65E0;//segment:ovl_i5
+Macbeth_Actor207_Init = 0x801A7D98;//segment:ovl_i5
 Ground_801B6E20 = 0x801B6E20;//segment:ovl_i5
 D_i5_801B74F0 = 0x801B74F0;//segment:ovl_i5 size:28
 D_TI_801B7584 = 0x801B7584;//segment:ovl_i5
@@ -197,7 +197,7 @@ D_MA_801BA1E8 = 0x801BA1E8;//segment:ovl_i5
 D_MA_801BE250 = 0x801BE250;//segment:ovl_i5 size:0x20
 D_MA_801BE2F0 = 0x801BE2F0;//segment:ovl_i5 size:0x12
 D_i5_801B8198 = 0x801B8198;//size:0x210 segment:ovl_i5
-D_TI_801B83A8 = 0x801B83A8;//size:0x814 type:f32 segment:ovl_i5
+aTiGorasHitbox = 0x801B83A8;//size:0x814 type:f32 segment:ovl_i5
 D_i5_801BA708 = 0x801BA708;//size:0xC type:Vec3f segment:ovl_i5
 D_i5_801BAA50 = 0x801BAA50;//size:0x28 type:s16 segment:ovl_i5
 D_i5_801BBEE0 = 0x801BBEE0;//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_Boss314_Init = 0x80197CC4; //segment:ovl_i6
-Andross_Boss320_Init = 0x8018D16C; //segment:ovl_i6
+SectorY_SyShogun_Init = 0x80197CC4; //segment:ovl_i6
+Andross_AndAndross_Init = 0x8018D16C; //segment:ovl_i6
 sTeamInitPos = 0x801A68B0;//size:0x48 type:Vec3f segment:ovl_i6
 sTeamInitRot = 0x801A68F8;//size:0xC type:f32 segment:ovl_i6
 D_i6_801A7F30 = 0x801A7F30; //segment:ovl_i6