From d32854ced18eb334bbba4e2e67074bae641688c2 Mon Sep 17 00:00:00 2001
From: petrie911 <69443847+petrie911@users.noreply.github.com>
Date: Fri, 24 Nov 2023 13:11:20 -0600
Subject: Proposed names for library stuff (#29)

* get this started

* linker scripts fixed

* oh god what now

* names

* the blue pill

* names, perhaps

* save

* clean out structs

* save for later again

* more names

* save, again
---
 linker_scripts/us/symbol_addrs.txt            | 128 ++------------------------
 linker_scripts/us/symbol_addrs_nlib_funcs.txt | 124 +++++++++++++++++++++++++
 linker_scripts/us/symbol_addrs_nlib_vars.txt  | 121 ++++++++++++++++++++++++
 3 files changed, 252 insertions(+), 121 deletions(-)
 create mode 100644 linker_scripts/us/symbol_addrs_nlib_funcs.txt
 create mode 100644 linker_scripts/us/symbol_addrs_nlib_vars.txt

(limited to 'linker_scripts')

diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt
index 65d92ebc..664d003d 100644
--- a/linker_scripts/us/symbol_addrs.txt
+++ b/linker_scripts/us/symbol_addrs.txt
@@ -1,40 +1,7 @@
-bootproc = 0x80004DA8;
 D_800C90F0 = 0x800C90F0;
 __libm_qnan_f = 0x800C9570;
 D_1 = 0x1; //ignore:true
 
-Math_ModF = 0x80004E20;
-Rand_Init = 0x80004E4C;
-Rand_ZeroOne = 0x80004EB0;
-Rand_SetSeed = 0x80004FC8;
-Rand_ZeroOneSeeded = 0x80004FE8;
-Math_Atan2F = 0x80005100;
-Math_Atan2F_XY = 0x800051F8;
-Math_Atan2F_XYAlt = 0x80005320;
-Math_FactorialF = 0x800053C8;
-Math_Factorial = 0x800054C8;
-Math_PowF = 0x800055DC;
-Math_MinMax = 0x80005604;
-
-Matrix_Copy = 0x80005680;
-Matrix_Push = 0x80005708;
-Matrix_Pop = 0x80005740;
-Matrix_Mult = 0x80005754;
-Matrix_Translate = 0x80005B00;
-Matrix_Scale = 0x80005C34;
-Matrix_RotateX = 0x80005D44;
-Matrix_RotateY = 0x80005E90;
-Matrix_RotateZ = 0x80005FE0;
-Matrix_RotateAxis = 0x8000612C;
-Matrix_ToMtx = 0x80006500;
-Matrix_FromMtx = 0x8000671C;
-Matrix_MultVec3f = 0x80006970;
-Matrix_MultVec3fNoTranslate = 0x80006A20;
-Matrix_GetYRPAngles = 0x80006AB8;
-Matrix_GetXYZAngles = 0x80006C7C;
-Matrix_LookAt = 0x80006E3C;
-Matrix_SetGfxMtx = 0x80006EB8;
-
 D_800C45E0 = 0x800C45E0;
 
 D_800C57EC = 0x800C57EC;
@@ -43,112 +10,31 @@ D_800C5FF4 = 0x800C5FF4; //type:u16 size:5000
 
 D_80163FE0 = 0x80163FE0; //size:0xB130
 
+gZBuffer = 0x80282000;
+gFrameBuffers = 0x8038F800;
 gDmaTable = 0x80178A70;
 
 D_800D3180 = 0x800D3180; // size:0x1E
 gSetupDLs = 0x800D31B0; // size:0x18C0
 
-D_800DD880 = 0x800DD880; // size:0x18
-D_800DD898 = 0x800DD898; // size:0x18
-D_800DD8B0 = 0x800DD8B0; // size:0x4
-D_800DD8B4 = 0x800DD8B4; // size:0x4
-D_800DD8B8 = 0x800DD8B8; // size:0x4
-D_800DD8BC = 0x800DD8BC; // ignore:true
-D_800DD8C0 = 0x800DD8C0; // size:0x18
-D_800DD8D8 = 0x800DD8D8; // size:0x18
-D_800DD8F0 = 0x800DD8F0; // size:0x10
+
 D_800DD900 = 0x800DD900; // size:0x1A0
 
 D_800CBDD4 = 0x800CBDD4; //size:0x98
 
-D_80178870 = 0x80178870; //size:0x200
-
-D_800E20F0 = 0x800E20F0;
-gTaskMsgQueue = 0x800E21E0;
-D_800E2238 = 0x800E2238;
-D_800E2258 = 0x800E2258;
-D_800E2278 = 0x800E2278;
-D_800E22A0 = 0x800E22A0;
-gSerialEventQueue = 0x800E2128;
-gMainThreadMsgQueue = 0x800E2148;
-gThread7msgQueue = 0x800E2338;
-D_800E2390 = 0x800E2390;
-gSerialThreadMsgQueue = 0x800E22C0;
-D_800E22F8 = 0x800E22F8;
-D_800E2318 = 0x800E2318;
-
-Thread7_ThreadEntry = 0x800040D4;
-SerialInterface_ThreadEntry = 0x80003FEC;
-
-gIdentityMtx = 0x800C4620;
-gIdentityMatrix = 0x800C4660;
-
-sFaultCharPixelFlags = 0x800C4770;
-sFaultCharIndex = 0x800C46F0;
-
-Math_FAtanF = 0x8001FBE8;
-Math_FAtan2F = 0x8001FD0C;
-Math_FAsinF = 0x8001FE00;
-Math_FAcosF = 0x8001FE30;
-
-Fault_Init = 0x80008018;
-func_80003C50 = 0x80003C50;
-
-Idle_ThreadEntry = 0x80004D00;
-Main_ThreadEntry = 0x80004ABC;
-Audio_ThreadEntry = 0x80003B48;
-Graphics_ThreadEntry = 0x80004144;
+Save_Checksum = 0x800C2FB0;
+Save_Write = 0x800C3084;
+Save_Read = 0x800C3194;
+gSaveFile = 0x80178870; //size:0x200
 
 __rspboot_start = 0x80000450;
 __rspboot_end = 0x80000520;
 __f3dex_start = 0x80001410;
 gF3dexData = 0x800C3DD0;
 
-gAudioThreadStack =  0x800DDAA0;
-gGraphicsThread =      0x800DEAA0;
-gGraphicsThreadStack = 0x800DEC50;
-gUnkThread3 =      0x800DFC50;
-gUnkThread3Stack = 0x800DFE00;
-gSerialThread =      0x800E0E00;
-gSerialThreadStack = 0x800E0FB0;
-
-gCurrentTask = 0x800E1FB0;
-D_800E1FB4 = 0x800E1FB4;
-D_800E1FB8 = 0x800E1FB8;
-D_800E1FC0 = 0x800E1FC0;
-D_800E1FC8 = 0x800E1FC8;
-
 D_800CBD3C = 0x800CBD3C;
 
-gPiMgrCmdQueue = 0x800E2010;
-sPiMgrCmdBuff = 0x800E2028;
-sIdleThread = 0x80138E90;
-sIdleThreadStack = 0x80139040;
-gMainThread = 0x8013A040;
-sMainThreadStack = 0x8013A1F0;
-gAudioThread = 0x8013B1F0;
-
-gSegments = 0x800E1FD0;
-gGfxPools = 0x800E23B0; // size:0x55AA0
-gGfxPool = 0x80137E50;
-gGfxTask = 0x80137E54;
-gViewport = 0x80137E58;
-gGfxMtx = 0x80137E5C;
-gUnkDisp1 = 0x80137E60;
-gMasterDisp = 0x80137E64;
-gUnkDisp2 = 0x80137E68;
-gLight = 0x80137E6C;
-gFrameBuffer = 0x80137E70;
-D_80137E74 = 0x80137E74;
-gFrameBuffers = 0x8038F800;
-D_8013C3D0 = 0x8013C3D0; // size:0x8800
-gFaultMgr = 0x80145360; // size:0x9D8
-
 D_80177E88 = 0x80177E88; // size:0xC
-
-Mio0_Decompress = 0x8001EE70;
-RdRam_CheckIPL3 = 0x8001EF10;
-
 D_800CFA54 = 0x800CFA54;
 
 D_800D934C = 0x800D934C; // force_migration:True
diff --git a/linker_scripts/us/symbol_addrs_nlib_funcs.txt b/linker_scripts/us/symbol_addrs_nlib_funcs.txt
new file mode 100644
index 00000000..ee17e4c5
--- /dev/null
+++ b/linker_scripts/us/symbol_addrs_nlib_funcs.txt
@@ -0,0 +1,124 @@
+// joybus
+Controller_AddDeadZone = 0x80002840;
+Controller_Init = 0x8000291C;
+Controller_UpdateInput = 0x800029A8;
+Controller_ReadData = 0x80002AF4;
+Save_ReadData = 0x80002BE8;
+Save_WriteData = 0x80002C50;
+Controller_Rumble = 0x80002CB8;
+
+// lib
+Lib_vsPrintf = 0x80002E80;
+Lib_vTable = 0x80002EA0;
+Lib_SwapBuffers = 0x80002EE4;
+Lib_QuickSort = 0x80002F88;
+Lib_Perspective = 0x8000316C;
+Lib_Ortho = 0x800032B4;
+Lib_DmaRead = 0x800033E0;
+Lib_FillScreen = 0x800034E8;
+
+// lights
+Lights_AddLight = 0x800035D0;
+Lights_SetOneLight = 0x8000372C;
+Lights_SetTwoLights = 0x800038AC;
+
+// main
+Main_Initialize = 0x80003A50;
+Audio_ThreadEntry = 0x80003B48;
+Graphics_SetTask = 0x80003C50;
+Graphics_InitializeTask = 0x80003DC0;
+Main_SetVIMode = 0x80003EE0;
+SerialInterface_ThreadEntry = 0x80003FEC;
+Timer_ThreadEntry = 0x800040D4;
+Graphics_ThreadEntry = 0x80004144;
+Main_HandleRDP = 0x80004714;
+Main_StartNextTask = 0x800049D4;
+Main_ThreadEntry = 0x80004ABC;
+Idle_ThreadEntry = 0x80004D00;
+bootproc = 0x80004DA8;
+
+// math
+Math_ModF = 0x80004E20;
+Rand_Init = 0x80004E4C;
+Rand_ZeroOne = 0x80004EB0;
+Rand_SetSeed = 0x80004FC8;
+Rand_ZeroOneSeeded = 0x80004FE8;
+Math_Atan2F = 0x80005100;
+Math_Atan2F_XY = 0x800051F8;
+Math_Atan2F_XYAlt = 0x80005320;
+Math_FactorialF = 0x800053C8;
+Math_Factorial = 0x800054C8;
+Math_PowF = 0x800055DC;
+Math_MinMax = 0x80005604;
+
+// matrix
+Matrix_Copy = 0x80005680;
+Matrix_Push = 0x80005708;
+Matrix_Pop = 0x80005740;
+Matrix_Mult = 0x80005754;
+Matrix_Translate = 0x80005B00;
+Matrix_Scale = 0x80005C34;
+Matrix_RotateX = 0x80005D44;
+Matrix_RotateY = 0x80005E90;
+Matrix_RotateZ = 0x80005FE0;
+Matrix_RotateAxis = 0x8000612C;
+Matrix_ToMtx = 0x80006500;
+Matrix_FromMtx = 0x8000671C;
+Matrix_MultVec3f = 0x80006970;
+Matrix_MultVec3fNoTranslate = 0x80006A20;
+Matrix_GetYRPAngles = 0x80006AB8;
+Matrix_GetXYZAngles = 0x80006C7C;
+Matrix_LookAt = 0x80006E3C;
+Matrix_SetGfxMtx = 0x80006EB8;
+
+// memory
+Memory_FreeAll = 0x80006F20;
+Memory_Allocate = 0x80006F38;
+
+// thread 7
+Timer_AllocateTask = 0x80006F60;
+Timer_Increment = 0x80007068;
+Timer_SetValue = 0x8000707C;
+Timer_CompleteTask = 0x80007088;
+Timer_Wait = 0x800070C8;
+
+// save
+Save_ReadBlock = 0x80007130;
+Save_WriteBlock = 0x8000716C;
+Save_WriteEeprom = 0x800071FC;
+Save_ReadEeprom = 0x800072E0;
+
+// fault
+func_800073C0 = 0x800073C0;
+func_800074AC = 0x800074AC;
+func_80007604 = 0x80007604;
+func_8000762C = 0x8000762C;
+func_8000770C = 0x8000770C;
+func_800077F8 = 0x800077F8;
+func_80007880 = 0x80007880;
+func_80007910 = 0x80007910;
+func_80007CEC = 0x80007CEC;
+func_80007FE4 = 0x80007FE4;
+Fault_Init = 0x80008018;
+
+// audio
+
+// hasm
+Mio0_Decompress = 0x8001EE70;
+RdRam_CheckIPL3 = 0x8001EF10;
+
+// math64
+Math_FAtanF = 0x8001FBE8;
+Math_FAtan2F = 0x8001FD0C;
+Math_FAsinF = 0x8001FE00;
+Math_FAcosF = 0x8001FE30;
+
+
+
+
+
+
+
+
+
+
diff --git a/linker_scripts/us/symbol_addrs_nlib_vars.txt b/linker_scripts/us/symbol_addrs_nlib_vars.txt
new file mode 100644
index 00000000..cbaedde7
--- /dev/null
+++ b/linker_scripts/us/symbol_addrs_nlib_vars.txt
@@ -0,0 +1,121 @@
+// joybus
+gCurrentInput = 0x800DD880; // size:0x18
+gChangedInput = 0x800DD898; // size:0x18
+gControllerStatus = 0x800DD8B0; // size:0x4
+gStopInputTimer = 0x800DD8B4; // size:0x4
+gRumbleStatus = 0x800DD8B8; // size:0x4
+D_800DD8BC = 0x800DD8BC; // ignore:true
+sNextInput = 0x800DD8C0; // size:0x18
+sPrevInput = 0x800DD8D8; // size:0x18
+D_800DD8F0 = 0x800DD8F0; // size:0x10
+
+// main
+gAudioThreadStack =  0x800DDAA0;
+gGraphicsThread =      0x800DEAA0;
+gGraphicsThreadStack = 0x800DEC50;
+gTimerThread =      0x800DFC50;
+gTimerThreadStack = 0x800DFE00;
+gSerialThread =      0x800E0E00;
+gSerialThreadStack = 0x800E0FB0;
+
+gCurrentTask = 0x800E1FB0;
+sAudioTasks = 0x800E1FB4;
+sGfxTasks = 0x800E1FB8;
+sNewAudioTasks = 0x800E1FC0;
+sNewGfxTasks = 0x800E1FC8;
+gSegments = 0x800E1FD0;
+gPiMgrCmdQueue = 0x800E2010;
+sPiMgrCmdBuff = 0x800E2028;
+
+gDmaMsgQueue = 0x800E20F0;
+
+sDmaMsgBuff = 0x800E2108;
+gDmaIOMsg = 0x800E2110;
+gSerialEventQueue = 0x800E2128;
+sSerialEventBuff = 0x800E2140;
+gMainThreadMsgQueue = 0x800E2148;
+sMainThreadMsgBuff = 0x800E2160;
+gTaskMsgQueue = 0x800E21E0;
+sTaskMsgBuff = 0x800E21F8;
+gAudioVImsgQueue = 0x800E2238;
+gAudioTaskMsgQueue = 0x800E2258;
+gGfxVImsgQueue = 0x800E2278;
+gGfxTaskMsgQueue = 0x800E22A0;
+sAudioVImsgBuff = 0x800E2250;
+sAudioTaskMsgBuff = 0x800E2270;
+sGfxVImsgBuff = 0x800E2290;
+sGfxTaskMsgBuff = 0x800E22B8;
+gSerialThreadMsgQueue = 0x800E22C0;
+sSerialThreadMsgBuff = 0x800E22D8;
+gControllerMsgQueue = 0x800E22F8;
+sControllerMsgBuff = 0x800E2310;
+gSaveMsgQueue = 0x800E2318;
+sSaveMsgBuff = 0x800E2330;
+gTimerTaskMsgQueue = 0x800E2338;
+sTimerTaskMsgBuff = 0x800E2350;
+gTimerWaitMsgQueue = 0x800E2390;
+sTimerWaitMsgBuff = 0x800E23A8;
+
+gGfxPools = 0x800E23B0; // size:0x55AA0
+gGfxPool = 0x80137E50;
+gGfxTask = 0x80137E54;
+gViewport = 0x80137E58;
+gGfxMtx = 0x80137E5C;
+gUnkDisp1 = 0x80137E60;
+gMasterDisp = 0x80137E64;
+gUnkDisp2 = 0x80137E68;
+gLight = 0x80137E6C;
+gFrameBuffer = 0x80137E70;
+D_80137E74 = 0x80137E74;
+D_80137E78 = 0x80137E78;
+gFrameCounter = 0x80137E7C;
+gStartNMI = 0x80137E80;
+gStopTasks = 0x80137E81;
+D_80137E84 = 0x80137E84; // size:0x4
+gFillScreenColor = 0x80137E88;
+gFillScreen = 0x80137E8A;
+
+gUnusedStack = 0x80137E90;
+sIdleThread = 0x80138E90;
+sIdleThreadStack = 0x80139040;
+gMainThread = 0x8013A040;
+sMainThreadStack = 0x8013A1F0;
+gAudioThread = 0x8013B1F0;
+
+// math
+sSeededRandSeed3 = 0x8013B3A0;
+sRandSeed1 = 0x8013B3A4;
+sRandSeed2 = 0x8013B3A8;
+sRandSeed3 = 0x8013B3AC;
+sSeededRandSeed1 = 0x8013B3B0;
+sSeededRandSeed2 = 0x8013B3B4;
+
+// matrix 
+gIdentityMtx = 0x800C4620;
+gIdentityMatrix = 0x800C4660;
+gGfxMatrix = 0x8013B3C0;
+sGfxMatrixStack = 0x8013B3C8;
+gCalcMatrix = 0x8013BBC8;
+sCalcMatrixStack = 0x8013BBD0;
+
+// memory 
+sMemoryBuffer = 0x8013C3D0; // size:0x8800
+sMemoryPtr = 0x80144BD0;
+
+// thread 7
+sTimerTasks = 0x80144BE0;
+
+// save 
+gSaveIOBuffer = 0x80144F60;
+sPrevSaveData = 0x80145160;
+
+// fault 
+gFaultMgr = 0x80145360; // size:0x9D8
+sFaultCharIndex = 0x800C46F0;
+sFaultCharPixelFlags = 0x800C4770;
+sFaultCauses = 0x800C4870;
+sFloatExceptions = 0x800C48B8;
+
+// audio
+
+
-- 
cgit v1.2.3