summaryrefslogtreecommitdiff
path: root/linker_scripts
diff options
context:
space:
mode:
Diffstat (limited to 'linker_scripts')
-rw-r--r--linker_scripts/us/symbol_addrs_audio.txt2
-rw-r--r--linker_scripts/us/symbol_addrs_engine.txt124
-rw-r--r--linker_scripts/us/symbol_addrs_overlays.txt2
3 files changed, 64 insertions, 64 deletions
diff --git a/linker_scripts/us/symbol_addrs_audio.txt b/linker_scripts/us/symbol_addrs_audio.txt
index c3f16723..4ecb8a71 100644
--- a/linker_scripts/us/symbol_addrs_audio.txt
+++ b/linker_scripts/us/symbol_addrs_audio.txt
@@ -401,7 +401,7 @@ func_800168BC = 0x800168BC;
-func_80016A50 = 0x80016A50;
+Audio_dummy_80016A50 = 0x80016A50;
Audio_GetSfxFalloff = 0x80016A58;
Audio_GetSfxReverb = 0x80016BC0;
Audio_GetSfxPan = 0x80016CDC;
diff --git a/linker_scripts/us/symbol_addrs_engine.txt b/linker_scripts/us/symbol_addrs_engine.txt
index 03dd42b3..c60e1d9f 100644
--- a/linker_scripts/us/symbol_addrs_engine.txt
+++ b/linker_scripts/us/symbol_addrs_engine.txt
@@ -111,15 +111,15 @@ RCP_SetupDL_50 = 0x800BA610;
RCP_SetupDL_61 = 0x800BA640;
// fox_radio
-D_radio_80178720 = 0x80178720;
-D_radio_80178724 = 0x80178724;
-D_radio_80178728 = 0x80178728;
-D_radio_8017872C = 0x8017872C;
-D_radio_80178730 = 0x80178730;
-D_radio_80178734 = 0x80178734;
-D_radio_80178738 = 0x80178738;
-D_radio_8017873C = 0x8017873C;
-D_radio_80178740 = 0x80178740;
+gRadioMsgList = 0x80178720;
+gRadioMsgListIndex = 0x80178724;
+gRadioPrintPosX = 0x80178728;
+gRadioPrintPosY = 0x8017872C;
+gRadioTextBoxPosX = 0x80178730;
+gRadioTextBoxPosY = 0x80178734;
+gRadioTextBoxScaleX = 0x80178738;
+gRadioPortraitPosX = 0x8017873C;
+gRadioPortraitPosY = 0x80178740;
sRadioUseRedBox = 0x80178744;
D_radio_80178748 = 0x80178748;
@@ -127,14 +127,14 @@ D_radio_80178748 = 0x80178748;
sUnlockLandmaster = 0x8017875C;
sUnlockOnFoot = 0x80178760;
-gCurrentMsgPri = 0x800D4A70;
+gRadioMsgPri = 0x800D4A70;
func_radio_800BA760 = 0x800BA760;
func_radio_800BA7BC = 0x800BA7BC;
Radio_PlayMessage = 0x800BA808;
func_radio_800BAAE8 = 0x800BAAE8;
func_radio_800BB388 = 0x800BB388;
-func_radio_800BB5D0 = 0x800BB5D0;
+Radio_Draw = 0x800BB5D0;
// fox_message
gTextCharTextures = 0x80179010;
@@ -156,8 +156,8 @@ sSunShifts = 0x800C9CC4;
sKaSunShifts = 0x800C9CF8;
// fox_boss
-func_boss_8004319C = 0x8004319C;
-func_boss_80042EC0 = 0x80042EC0;
+Boss_CompleteLevel = 0x8004319C;
+Boss_AwardBonus = 0x80042EC0;
gBossFrameCount = 0x801613A0;
// fox_save
@@ -276,7 +276,7 @@ func_enmy_80061E48 = 0x80061E48;
ActorEvent_Load = 0x80061F0C;
Object_Load = 0x80062180;
func_enmy_80062568 = 0x80062568;
-Object_LoadFromInit = 0x80062664;
+Object_LoadLevelObjects = 0x80062664;
func_enmy_80062B60 = 0x80062B60;
func_enmy_80062C38 = 0x80062C38;
func_enmy_80062D04 = 0x80062D04;
@@ -398,12 +398,12 @@ D_800D1AEC = 0x800D1AEC; //type:s32 size:0x1B0
// fox_play
gSavedZoSearchlightStatus = 0x80161A50;
-D_play_80161A54 = 0x80161A54;
+gArwingSpeed = 0x80161A54;
D_play_80161A5C = 0x80161A5C;
gScreenFlashTimer = 0x80161A60;
gDropHitCountItem = 0x80161A62;
D_play_80161A64 = 0x80161A64;
-sEnvSettings = 0x80161A68;
+sEnvironment = 0x80161A68;
gVenomHardClear = 0x800D2F68; //type:u8
// fox_context
@@ -413,8 +413,8 @@ D_ctx_80161A78 = 0x80161A78;
D_ctx_80161A7C = 0x80161A7C;
D_ctx_80161A80 = 0x80161A80;
D_ctx_80161A84 = 0x80161A84;
-gGroundType = 0x80161A88;
-gSavedGroundType = 0x80161A8C;
+gGroundSurface = 0x80161A88;
+gSavedGroundSurface = 0x80161A8C;
gGoldRingCount = 0x80161A90;
gHitCount = 0x80161A98;
gSavedHitCount = 0x80161A9C;
@@ -460,12 +460,12 @@ gHandicap = 0x80177888;
gDrawMode = 0x80177898;
gVersusStage = 0x8017789C;
gPlayerNum = 0x801778A0;
-D_ctx_801778A4 = 0x801778A4;
+gVsPointsToWin = 0x801778A4;
gCamCount = 0x801778A8;
D_801778AB = 0x801778AB;
-D_ctx_801778AC = 0x801778AC;
+gVsMatchType = 0x801778AC;
gTeamShields = 0x801778B0; //size:0x18
-D_ctx_801778C8 = 0x801778C8;
+gVsTimeTrialLimit = 0x801778C8;
gSavedTeamShields = 0x801778D0; //size:0x18
gVersusMode = 0x801778E8;
gPrevPlanetSavedTeamShields = 0x801778F0;//size=0x18
@@ -505,11 +505,11 @@ D_ctx_80177AB0 = 0x80177AB0;
gShieldAlpha = 0x80177AB8;
gAqDrawMode = 0x80177AC8;
gHasShield = 0x80177AD0;
-D_ctx_80177AE0 = 0x80177AE0;
+gTitleState = 0x80177AE0;
gShieldTimer = 0x80177AE8;
gMainController = 0x80177AF8;
gVsLockOnTimers = 0x80177B00;
-D_ctx_80177B40 = 0x80177B40;
+gMapState = 0x80177B40;
gStartAndrossFightTimer = 0x80177B44;
gMissionNumber = 0x80177B48;
gMissionTeamStatus = 0x80177B50;
@@ -527,7 +527,7 @@ gBgmSeqId = 0x80177C90;
D_ctx_80177C94 = 0x80177C94;
gLevelType = 0x80177C98;
D_ctx_80177C9C = 0x80177C9C;
-D_ctx_80177CA0 = 0x80177CA0;
+gSavedObjectLoadIndex = 0x80177CA0;
D_ctx_80177CA4 = 0x80177CA4;
D_ctx_80177CAC = 0x80177CAC;
D_ctx_80177CB0 = 0x80177CB0;
@@ -540,16 +540,16 @@ D_ctx_80177D08 = 0x80177D08;
gRightWingHealth = 0x80177D10;
D_ctx_80177D20 = 0x80177D20;
gLeftWingHealth = 0x80177D28;
-D_ctx_80177D38 = 0x80177D38;
-D_ctx_80177D40 = 0x80177D40;
-D_ctx_80177D50 = 0x80177D50;
-D_ctx_80177D58 = 0x80177D58;
-D_ctx_80177D68 = 0x80177D68;
-D_ctx_80177D70 = 0x80177D70;
-D_ctx_80177D88 = 0x80177D88;
+gRadioPortraitScaleY = 0x80177D38;
+gRightWingFlashTimer = 0x80177D40;
+gRadioTextBoxScaleY = 0x80177D50;
+gLeftWingFlashTimer = 0x80177D58;
+gRadioMsgRadioId = 0x80177D68;
+gRightWingDebrisTimer = 0x80177D70;
+gLeftWingDebrisTimer = 0x80177D88;
gBombCount = 0x80177DA0;
gGameFrameCount = 0x80177DB0;
-D_ctx_80177DC8 = 0x80177DC8;
+gObjectLoadIndex = 0x80177DC8;
gPrevEventActorIndex = 0x80177E70;
D_ctx_80177E78 = 0x80177E78;
gRingPassCount = 0x80177E80;
@@ -571,21 +571,21 @@ gStarOffsetsY = 0x80178290;
D_ctx_80178294 = 0x80178294;
gStarFillColors = 0x80178298;
gRadioState = 0x8017829C;
-D_ctx_801782A4 = 0x801782A4;
+gCurrentRadioPortrait = 0x801782A4;
gScenery360 = 0x801782A8;
-D_Timer_801782AC = 0x801782AC;
-D_Timer_801782B4 = 0x801782B4;
+gRadioStateTimer = 0x801782AC;
+gRadioMouthTimer = 0x801782B4;
D_ctx_801782B8 = 0x801782B8;
D_ctx_801782BC = 0x801782BC;
D_ctx_801782C0 = 0x801782C0;
D_ctx_801782D0 = 0x801782D0;
D_ctx_801782D4 = 0x801782D4;
-D_ctx_801782D8 = 0x801782D8;
-D_ctx_801782E8 = 0x801782E8;
-D_ctx_801782F8 = 0x801782F8;
+gRadioMsgCharIndex = 0x801782D8;
+gRadioMsgId = 0x801782E8;
+gMsgCharIsPrinting = 0x801782F8;
D_ctx_801782FC = 0x801782FC;
-D_ctx_80178300 = 0x80178300;
-D_ctx_80178308 = 0x80178308;
+gHideRadio = 0x80178300;
+gRadioMsg = 0x80178308;
gLevelObjects = 0x80178310;
gFogRed = 0x80178320;
gFogGreen = 0x80178328;
@@ -623,26 +623,26 @@ gCameraShakeY = 0x8017847C;
gCameraShake = 0x80178480;
gLoadLevelObjects = 0x80178488;
D_ctx_801784A4 = 0x801784A4;
-D_ctx_801784AC = 0x801784AC;
-D_ctx_801784B8 = 0x801784B8;
-D_ctx_801784BC = 0x801784BC;
-D_ctx_801784C0 = 0x801784C0;
-D_ctx_801784C4 = 0x801784C4;
-D_ctx_801784C8 = 0x801784C8;
-D_ctx_801784CC = 0x801784CC;
-D_ctx_801784D0 = 0x801784D0;
-D_ctx_801784D4 = 0x801784D4;
-D_ctx_801784D8 = 0x801784D8;
+gGroundType = 0x801784AC;
+gLight1xRot = 0x801784B8;
+gLight1yRot = 0x801784BC;
+gLight1zRot = 0x801784C0;
+gLight1xRotTarget = 0x801784C4;
+gLight1yRotTarget = 0x801784C8;
+gLight1zRotTarget = 0x801784CC;
+gEnvLightxRot = 0x801784D0;
+gEnvLightyRot = 0x801784D4;
+gEnvLightzRot = 0x801784D8;
gLight1x = 0x801784DC;
gLight1y = 0x801784E0;
gLight1z = 0x801784E4;
-D_ctx_801784E8 = 0x801784E8;
-D_ctx_801784EC = 0x801784EC;
-D_ctx_801784F0 = 0x801784F0;
-D_ctx_801784F4 = 0x801784F4;
-D_ctx_801784F8 = 0x801784F8;
-D_ctx_801784FC = 0x801784FC;
-D_ctx_80178500 = 0x80178500;
+gLight1rotStep = 0x801784E8;
+gLight2xRot = 0x801784EC;
+gLight2yRot = 0x801784F0;
+gLight2zRot = 0x801784F4;
+gLight2xRotTarget = 0x801784F8;
+gLight2yRotTarget = 0x801784FC;
+gLight2zRotTarget = 0x80178500;
gLight2x = 0x80178504;
gLight2y = 0x80178508;
gLight2z = 0x8017850C;
@@ -651,7 +651,7 @@ D_ctx_80178524 = 0x80178524;
D_ctx_80178528 = 0x80178528;
D_ctx_80178538 = 0x80178538;
D_ctx_8017853C = 0x8017853C;
-D_ctx_80178540 = 0x80178540;
+gLight2colorStep = 0x80178540;
D_ctx_80178544 = 0x80178544;
gLight1R = 0x80178548;
gLight1G = 0x8017854C;
@@ -662,9 +662,9 @@ gAmbientB = 0x8017855C;
gLight2R = 0x80178564;
gLight2G = 0x80178568;
gLight2B = 0x8017856C;
-D_ctx_80178570 = 0x80178570;
-D_ctx_80178574 = 0x80178574;
-D_ctx_80178578 = 0x80178578;
+gLight2RTarget = 0x80178570;
+gLight2GTarget = 0x80178574;
+gLight2BTarget = 0x80178578;
Play_GetMaxShields = 0x800A3FC4;
func_play_800A3FB0 = 0x800A3FB0;
@@ -771,4 +771,4 @@ D_tank_800C9F2C = 0x800C9F2C;
gNoHitbox = 0x800CBF34;
D_bg_8015F970 = 0x8015F970;
D_bg_8015F984 = 0x8015F984;
-D_ctx_8017796C = 0x8017796C;
+gTeamLowHealthMsgTimer = 0x8017796C;
diff --git a/linker_scripts/us/symbol_addrs_overlays.txt b/linker_scripts/us/symbol_addrs_overlays.txt
index ed319ef1..71fee18e 100644
--- a/linker_scripts/us/symbol_addrs_overlays.txt
+++ b/linker_scripts/us/symbol_addrs_overlays.txt
@@ -154,7 +154,7 @@ D_i3_801C2740 = 0x801C2740; //segment:ovl_i3 size:0x28
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_UpdateEvents = 0x80198594;//segment:ovl_i4
Katina_Boss316_Init = 0x80193CA4;//segment:ovl_i4
SectorZ_Missile_Update = 0x80199C60;//segment:ovl_i4
SectorZ_80199900 = 0x80199900;//segment:ovl_i4