Further docs on script, various other things (#204)

* stuff

* too much

* Torch commit

* torch again

* names and such

* names

* even more stuff

* format

* enums

* whoops on the gbi

2 files changed, 60 insertions, 60 deletions

diff --git a/linker_scripts/us/symbol_addrs_engine.txt b/linker_scripts/us/symbol_addrs_engine.txt
index b937f0b4..26376749 100644
--- a/linker_scripts/us/symbol_addrs_engine.txt
+++ b/linker_scripts/us/symbol_addrs_engine.txt
@@ -120,7 +120,7 @@ D_radio_80178734 = 0x80178734;
 D_radio_80178738 = 0x80178738;
 D_radio_8017873C = 0x8017873C;
 D_radio_80178740 = 0x80178740;
-D_radio_80178744 = 0x80178744;
+sRadioUseRedBox = 0x80178744;
 D_radio_80178748 = 0x80178748;
 
 // fox_versus
@@ -168,7 +168,7 @@ gSaveFile = 0x80178870; //size:0x200
 func_edisplay_800596C0 = 0x800596C0;
 func_edisplay_800597C0 = 0x800597C0;
 Graphics_SetScaleMtx = 0x8005980C;
-func_edisplay_80059850 = 0x80059850;
+Sprite168_Draw = 0x80059850;
 func_edisplay_800598DC = 0x800598DC;
 Actor201_Draw = 0x800598E8;
 func_edisplay_800599A4 = 0x800599A4;
@@ -179,8 +179,8 @@ func_edisplay_80059BB0 = 0x80059BB0;
 Obj42_Draw = 0x80059BBC;
 Actor196_Draw = 0x80059BF0;
 func_edisplay_80059C28 = 0x80059C28;
-func_edisplay_80059C34 = 0x80059C34;
-func_edisplay_80059C40 = 0x80059C40;
+Sprite167_Draw = 0x80059C34;
+FogShadow_Draw = 0x80059C40;
 func_edisplay_80059F68 = 0x80059F68;
 func_edisplay_80059FDC = 0x80059FDC;
 func_edisplay_8005A010 = 0x8005A010;
@@ -209,7 +209,7 @@ func_edisplay_8005D008 = 0x8005D008;
 func_edisplay_8005D1F0 = 0x8005D1F0;
 func_edisplay_8005D3CC = 0x8005D3CC;
 Object_80_Draw = 0x8005D654;
-Object_4C_Draw = 0x8005D8B8;
+Sprite_Draw = 0x8005D8B8;
 Actor_DrawOnRails = 0x8005D954;
 Actor_DrawAllRange = 0x8005DBC0;
 Boss_Draw = 0x8005E1B8;
@@ -258,13 +258,13 @@ func_enmy_80060FE4 = 0x80060FE4;
 func_enmy_80061148 = 0x80061148;
 Object_SetInfo = 0x800612B8;
 Object_80_Initialize = 0x80061364;
-Object_4C_Initialize = 0x80061394;
+Sprite_Initialize = 0x80061394;
 Actor_Initialize = 0x800613C4;
 Boss_Initialize = 0x80061404;
 Item_Initialize = 0x80061444;
 Effect_Initialize = 0x80061474;
 Object_80_Load = 0x800614B4;
-Object_4C_Load = 0x800615A0;
+Sprite_Load = 0x800615A0;
 Actor_Load = 0x8006168C;
 Boss_Load = 0x80061778;
 Item_Load = 0x80061864;
@@ -299,7 +299,7 @@ func_enmy_800655C8 = 0x800655C8;
 func_enmy_8006566C = 0x8006566C;
 func_enmy_800656D4 = 0x800656D4;
 func_enmy_800660F0 = 0x800660F0;
-func_enmy_80066254 = 0x80066254;
+Actor_Despawn = 0x80066254;
 func_enmy_8006654C = 0x8006654C;
 func_enmy_8006684C = 0x8006684C;
 func_enmy_800669A0 = 0x800669A0;
@@ -308,7 +308,7 @@ func_enmy_80066A8C = 0x80066A8C;
 func_enmy_80066C00 = 0x80066C00;
 func_enmy_80066D5C = 0x80066D5C;
 func_enmy_80066E80 = 0x80066E80;
-func_enmy_80066E8C = 0x80066E8C;
+Sprite167_Update = 0x80066E8C;
 func_enmy_80066EA8 = 0x80066EA8;
 func_enmy_80066EE4 = 0x80066EE4;
 func_enmy_80066EF0 = 0x80066EF0;
@@ -327,25 +327,25 @@ ItemGoldRing_Update = 0x800685F8;
 ItemWingRepair_Update = 0x80068618;
 ItemMeteoWarp_Update = 0x80068688;
 ItemCheckpoint_Update = 0x80068914;
-func_enmy_80068C48 = 0x80068C48;
-func_enmy_80068C88 = 0x80068C88;
-func_enmy_80068FE0 = 0x80068FE0;
+ItemRingCheck_Update = 0x80068C48;
+ItemPathChange_Update = 0x80068C88;
+Sprite_UpdateDoodad = 0x80068FE0;
 Object_Dying = 0x800690D0;
-func_enmy_800693E8 = 0x800693E8;
-func_enmy_80069658 = 0x80069658;
-func_enmy_800696F8 = 0x800696F8;
-func_enmy_80069858 = 0x80069858;
-func_enmy_80069924 = 0x80069924;
-func_enmy_80069A10 = 0x80069A10;
+Actor_Move = 0x800693E8;
+Boss_Move = 0x80069658;
+Object80_Move = 0x800696F8;
+Sprite_Move = 0x80069858;
+Effect_Move = 0x80069924;
+Item_Move = 0x80069A10;
 Actor_Update = 0x80069AAC;
 Boss_Update = 0x80069CBC;
 Object_80_Update = 0x80069DF4;
-Object_4C_Update = 0x80069E88;
+Sprite_Update = 0x80069E88;
 Item_Update = 0x80069F30;
 Effect_Update = 0x80069FD4;
 TexturedLine_Update = 0x8006A06C;
 TexturedLine_UpdateAll = 0x8006A38C;
-Object_UpdateAll = 0x8006A3E8;
+Object_Update = 0x8006A3E8;
 
 // fox_enmy2
 D_800D0DBC = 0x800D0DBC;//size:24
@@ -356,7 +356,7 @@ D_game_80161A14 = 0x80161A14;
 gPlayerInactive = 0x80161A18; //size:0x10
 D_game_80161A28 = 0x80161A28;
 D_game_80161A2C = 0x80161A2C;
-D_game_80161A2E = 0x80161A2E;
+gNextLevelStage = 0x80161A2E;
 gNextLevel = 0x80161A30;
 gNextGameState = 0x80161A32;
 D_game_80161A34 = 0x80161A34;
@@ -366,7 +366,7 @@ D_game_80161A39 = 0x80161A39;
 D_game_80161A3C = 0x80161A3C;
 D_game_80161A40 = 0x80161A40;
 D_game_80161A44 = 0x80161A44;
-D_game_800D2860 = 0x800D2860;
+gShowCrosshairs = 0x800D2860;
 D_game_800D2870 = 0x800D2870;
 sVsCameraULx = 0x800D2874;
 sVsCameraLRx = 0x800D2884;
@@ -381,7 +381,7 @@ func_game_800A1C14 = 0x800A1C14;
 func_game_800A1E68 = 0x800A1E68;
 func_game_800A1F44 = 0x800A1F44;
 func_game_800A1FB0 = 0x800A1FB0;
-func_game_800A24DC = 0x800A24DC;
+Game_Draw = 0x800A24DC;
 func_game_800A25DC = 0x800A25DC;
 Game_Update = 0x800A26C0;
 func_game_800A3608 = 0x800A3608;
@@ -397,7 +397,7 @@ gMedalFlashTimer = 0x801617B8;
 D_800D1AEC = 0x800D1AEC; //type:s32 size:0x1B0
 
 // fox_play
-D_play_80161A50 = 0x80161A50;
+gSavedZoSearchlightStatus = 0x80161A50;
 D_play_80161A54 = 0x80161A54;
 D_play_80161A5C = 0x80161A5C;
 gScreenFlashTimer = 0x80161A60;
@@ -413,8 +413,8 @@ D_ctx_80161A78 = 0x80161A78;
 D_ctx_80161A7C = 0x80161A7C;
 D_ctx_80161A80 = 0x80161A80;
 D_ctx_80161A84 = 0x80161A84;
-D_ctx_80161A88 = 0x80161A88;
-D_ctx_80161A8C = 0x80161A8C;
+gGroundType = 0x80161A88;
+gSavedGroundType = 0x80161A8C;
 gGoldRingCount = 0x80161A90;
 gHitCount = 0x80161A98;
 gSavedHitCount = 0x80161A9C;
@@ -422,7 +422,7 @@ gLifeCount = 0x80161AA0;
 gLaserStrength = 0x80161AA8;//size:0x10
 D_ctx_80161AB8 = 0x80161AB8;
 gObjects80 = 0x80161B00; //size:0x1900
-gObjects4C = 0x80163400; //size:0xBE0
+gSprites = 0x80163400; //size:0xBE0
 gActors = 0x80163FE0; //size:0xB130
 gBosses = 0x8016F110; //size:0x1020
 gEffects = 0x80170130; //size:0x36B0
@@ -441,17 +441,17 @@ gOverlaySetup = 0x801774F8;
 D_ctx_80177500 = 0x80177500;
 gOverlayStage = 0x80177820;
 D_ctx_80177824 = 0x80177824;
-D_ctx_80177828 = 0x80177828;
+gEnemyShotSpeed = 0x80177828;
 D_ctx_8017782C = 0x8017782C;
 D_ctx_80177830 = 0x80177830;
 gGameState = 0x80177834;
-D_ctx_80177838 = 0x80177838;
-D_Timer_8017783C = 0x8017783C;
-D_ctx_80177840 = 0x80177840;
+gLevelStatusScreenTimer = 0x80177838;
+gNextGameStateTimer = 0x8017783C;
+gLevelClearScreenTimer = 0x80177840;
 gOptionMenuStatus = 0x8017784C; //type:OptionState
 gBossHealthBar = 0x80177848;
 D_ctx_80177850 = 0x80177850;
-D_ctx_80177854 = 0x80177854;
+gPlayState = 0x80177854;
 D_ctx_80177858 = 0x80177858;
 D_ctx_80177868 = 0x80177868;
 D_ctx_80177870 = 0x80177870;
@@ -468,11 +468,11 @@ gTeamShields = 0x801778B0; //size:0x18
 D_ctx_801778C8 = 0x801778C8;
 gSavedTeamShields = 0x801778D0; //size:0x18
 gVersusMode = 0x801778E8;
-D_ctx_801778F0 = 0x801778F0;//size=0x18
+gPrevPlanetSavedTeamShields = 0x801778F0;//size=0x18
 gBoostButton = 0x80177908;
 gTeamDamage = 0x80177910;
 gBrakeButton = 0x80177928;
-D_ctx_80177930 = 0x80177930;
+gNextPlanetPath = 0x80177930;
 gShootButton = 0x80177938;
 gGroundLevel = 0x80177940;
 gBombButton = 0x80177948;
@@ -535,7 +535,7 @@ D_ctx_80177CB4 = 0x80177CB4;
 D_ctx_80177CBC = 0x80177CBC;
 D_ctx_80177CC4 = 0x80177CC4;
 D_ctx_80177CC8 = 0x80177CC8;
-D_ctx_80177CD0 = 0x80177CD0; // size:0x18
+gStarWolfTeamAlive = 0x80177CD0; // size:0x18
 D_ctx_80177D08 = 0x80177D08;
 gRightWingHealth = 0x80177D10;
 D_ctx_80177D20 = 0x80177D20;
@@ -552,9 +552,9 @@ gGameFrameCount = 0x80177DB0;
 D_ctx_80177DC8 = 0x80177DC8;
 D_ctx_80177E70 = 0x80177E70;
 D_ctx_80177E78 = 0x80177E78;
-D_ctx_80177E80 = 0x80177E80;
+gRingPassCount = 0x80177E80;
 D_ctx_80177E88 = 0x80177E88; // size:0xC
-D_ctx_80177E98 = 0x80177E98;
+gTeamArrowsViewPos = 0x80177E98;
 D_ctx_80177F10 = 0x80177F10;
 D_ctx_80177F20 = 0x80177F20; //size:0xF4
 D_ctx_80178028 = 0x80178028; //size:0xF4
@@ -562,7 +562,7 @@ D_ctx_8017812C = 0x8017812C;
 D_ctx_80178130 = 0x80178130; //size:0xF4
 gCurrentLevel = 0x80178234;
 D_ctx_80178238 = 0x80178238;//size:0x3D type:u8
-D_ctx_8017827C = 0x8017827C;
+gLevelStage = 0x8017827C;
 gPlayer = 0x80178280;
 gBossActive = 0x80178284;
 D_ctx_80178288 = 0x80178288;
@@ -586,26 +586,26 @@ D_ctx_801782F8 = 0x801782F8;
 D_ctx_801782FC = 0x801782FC;
 D_ctx_80178300 = 0x80178300;
 D_ctx_80178308 = 0x80178308;
-D_ctx_80178310 = 0x80178310;
+gLevelObjects = 0x80178310;
 gFogRed = 0x80178320;
 gFogGreen = 0x80178328;
 gFogBlue = 0x80178330;
 gFogAlpha = 0x80178338;
-D_ctx_80178340 = 0x80178340;
-D_ctx_80178348 = 0x80178348;
-D_ctx_80178350 = 0x80178350;
-D_ctx_80178354 = 0x80178354;
-D_ctx_80178358 = 0x80178358;
-D_ctx_8017835C = 0x8017835C;
+gFillScreenAlpha = 0x80178340;
+gFillScreenRed = 0x80178348;
+gFillScreenGreen = 0x80178350;
+gFillScreenBlue = 0x80178354;
+gFillScreenAlphaTarget = 0x80178358;
+gFillScreenAlphaStep = 0x8017835C;
 D_ctx_80178360 = 0x80178360;
 D_ctx_80178364 = 0x80178364;
 D_ctx_80178368 = 0x80178368;
 D_ctx_8017836C = 0x8017836C;
 D_ctx_80178370 = 0x80178370;
-D_ctx_80178380 = 0x80178380;
-D_ctx_80178390 = 0x80178390;
-D_ctx_801783A0 = 0x801783A0;
-D_ctx_801783B0 = 0x801783B0;
+gPlayerFillScreenAlphas = 0x80178380;
+gPlayerFillScreenReds = 0x80178390;
+gPlayerFillScreenGreens = 0x801783A0;
+gPlayerFillScreenBlues = 0x801783B0;
 D_ctx_801783D0 = 0x801783D0;
 D_ctx_801783D4 = 0x801783D4;
 gFogNear = 0x801783D8;
@@ -679,7 +679,7 @@ func_play_800A5330 = 0x800A5330;
 func_play_800A5338 = 0x800A5338;
 func_play_800A55B0 = 0x800A55B0;
 func_play_800A57E0 = 0x800A57E0;
-func_play_800A5844 = 0x800A5844;
+Play_Setup = 0x800A5844;
 func_play_800A594C = 0x800A594C;
 func_play_800A5D6C = 0x800A5D6C;
 func_play_800A5EBC = 0x800A5EBC;
@@ -690,7 +690,7 @@ BonusText_Initialize = 0x800A60B8;
 TexturedLine_Initialize = 0x800A60E8;
 RadarMark_Initialize = 0x800A6118;
 func_play_800A6148 = 0x800A6148;
-func_play_800A6590 = 0x800A6590;
+Play_UpdateFillScreen = 0x800A6590;
 func_play_800A668C = 0x800A668C;
 func_play_800A670C = 0x800A670C;
 func_play_800A69F8 = 0x800A69F8;
@@ -713,7 +713,7 @@ func_play_800AB304 = 0x800AB304;
 func_play_800AB334 = 0x800AB334;
 func_play_800AB964 = 0x800AB964;
 func_play_800ABA08 = 0x800ABA08;
-func_play_800ABAB4 = 0x800ABAB4;
+Play_Init = 0x800ABAB4;
 func_play_800AC290 = 0x800AC290;
 func_play_800AC650 = 0x800AC650;
 func_play_800ACA40 = 0x800ACA40;
@@ -750,7 +750,7 @@ func_play_800B41EC = 0x800B41EC;
 func_play_800B42B0 = 0x800B42B0;
 func_play_800B44C4 = 0x800B44C4;
 func_play_800B46F8 = 0x800B46F8;
-func_play_800B48BC = 0x800B48BC;
+Player_Update1 = 0x800B48BC;
 func_play_800B56BC = 0x800B56BC;
 func_play_800B5D30 = 0x800B5D30;
 func_play_800B5FBC = 0x800B5FBC;
@@ -759,16 +759,16 @@ func_play_800B6848 = 0x800B6848;
 func_play_800B6BFC = 0x800B6BFC;
 func_play_800B6F50 = 0x800B6F50;
 func_play_800B7184 = 0x800B7184;
-func_play_800B71E4 = 0x800B71E4;
+Player_Update2 = 0x800B71E4;
 func_play_800B73E0 = 0x800B73E0;
-func_play_800B79B0 = 0x800B79B0;
-func_play_800B832C = 0x800B832C;
+Play_UpdateLevel = 0x800B79B0;
+Play_Update = 0x800B832C;
 func_play_800B852C = 0x800B852C;
 func_play_800B86A4 = 0x800B86A4;
-func_play_800B86CC = 0x800B86CC;
+Play_Main = 0x800B86CC;
 
 D_tank_800C9F2C = 0x800C9F2C;
-D_edata_800CBF34 = 0x800CBF34;
+gHitboxNone = 0x800CBF34;
 D_bg_8015F970 = 0x8015F970;
 D_bg_8015F984 = 0x8015F984;
 D_ctx_8017796C = 0x8017796C;
diff --git a/linker_scripts/us/symbol_addrs_nlib_funcs.txt b/linker_scripts/us/symbol_addrs_nlib_funcs.txt
index d946b34f..15b60b1f 100644
--- a/linker_scripts/us/symbol_addrs_nlib_funcs.txt
+++ b/linker_scripts/us/symbol_addrs_nlib_funcs.txt
@@ -12,8 +12,8 @@ Lib_vsPrintf = 0x80002E80;
 Lib_vTable = 0x80002EA0;
 Lib_SwapBuffers = 0x80002EE4;
 Lib_QuickSort = 0x80002F88;
-Lib_Perspective = 0x8000316C;
-Lib_Ortho = 0x800032B4;
+Lib_InitPerspective = 0x8000316C;
+Lib_InitOrtho = 0x800032B4;
 Lib_DmaRead = 0x800033E0;
 Lib_FillScreen = 0x800034E8;