Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-11-26 22:40:33 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
e0c36018a7
sotn-decomp/config/symbols.pspeu.dra.txt

156 lines
4.4 KiB
Plaintext
Raw Normal View History

Add PSP DRA (#1119) Co-authored-by: sozud <122322823+sozud@users.noreply.github.com> Co-authored-by: bismurphy <tjmurphy@mit.edu>
2024-11-01 11:07:20 +00:00
func_800EA538 = 0x090DFC98;
func_800EA5AC = 0x090DFD38;
func_800EA5E4 = 0x090DFD70;
func_800EDB08 = 0x090E0CF0;
func_800EDB58 = 0x090E0D68;
AllocPrimitives = 0x090E0E30;
func_800EDD9C = 0x090E0F00;
FreePrimitives = 0x090E0FA8;
RenderPrimitives = 0x090E0FF8;
Decompile PSP version of func_801024DC (#1886) Picked a random `.c` file from PSP to decompile. This caused me to discover that this function requires `-O4,p`, which is new. All the other -O4 files also match with this, which is good. Also back-ported my changes to PS1. Some tiny changes to the texture displaying tools that I made due to xeeynamo finding a tiny bug; not worth a whole PR so I just tossed them into this one.
2024-11-08 20:11:45 +00:00
func_801024DC = 0x090E2720;
Working code-sharing for a file of PSP DRA and main DRA (#1895) Had to tweak some file splits, but ultimately I managed to decompile all of the functions in a PSP file, and then line up the two DRA codebases so that PSP could pull from the existing one. Of course, some of the functions also needed tweaking to end up matching on PSP. Glad to be able to prove this is possible in DRA!
2024-11-11 23:53:30 +00:00
func_801025F4 = 0x090E2820;
func_80102628 = 0x090E2848;
func_801026BC = 0x090E28D0;
func_801027A4 = 0x090E29A8;
Add PSP DRA (#1119) Co-authored-by: sozud <122322823+sozud@users.noreply.github.com> Co-authored-by: bismurphy <tjmurphy@mit.edu>
2024-11-01 11:07:20 +00:00
func_801027C4 = 0x090E29B0;
func_80102CD8 = 0x090E2EC8;
SetNextRoomToLoad = 0x090E73D0;
func_800F0CD8 = 0x090E74E8;
func_800F298C = 0x090e9018;
Decompile PSP DebugShowWaitInfo (#1899) Mostly an inconsequential function, but we can learn a whole lot from this one. 1. Lots more symbols added to PSP. This function touches a lot of previously-unseen things in PSP. 2. This is the first PSP function to print a string. Importantly, PSP puts strings in `data`, not `rodata`! Luckily, the process of pulling them in is simple and easy, as demonstrated here. 3. I modified the Makefile for the -O4 stuff. At this point I think DRA is `O4` and all the overlays are `O0`. We can always make the logic more complicated later if we need to. 4. We discovered a discrepancy in the size of DR_ENV on PSP. I suspect we will have more SDK differences, but we will find them function by function. I decided to set the size in a variable so that we can put all the version differences at the top of the file, instead of them being more scattered. I think that's it!
2024-11-13 18:06:22 +00:00
DebugShowWaitInfo = 0x090f5068;
Next funcs on psp DRA (#1902) I noticed that my previous function, `DebugShowWaitInfo`, is actually the first function in the C for ps1. To me, this suggests that all the prior code in PSP (there is a pretty large amount of it, about 0x18000 bytes) is PSP-exclusive. Therefore, I adjusted the file splits to start a file on that function. Then I did the next function, `DebugInputWait`. After that is a bunch of debug screen capturing functions. These appear to be unused (presumably used in development but not in the final game code) and therefore I assume they are missing due to deadstripping. Since we know that's an issue on PSP, I decided to make a dedicated macro to flag that code is being removed due to deadstripping - this way, if we get deadstripping to work as intended, we don't have to look through every VERSION_PSP usage to identify what is dead code, versus altered code. We can just find all the uses of `PSP_DEADSTRIP` and eliminate them. Leaving it there for now, will continue working through DRA in future PRs.
2024-11-14 20:14:40 +00:00
DebugInputWait = 0x090f50f8;
Add PSP DRA (#1119) Co-authored-by: sozud <122322823+sozud@users.noreply.github.com> Co-authored-by: bismurphy <tjmurphy@mit.edu>
2024-11-01 11:07:20 +00:00
DebugUpdate = 0x090f5180;
Finish a .c file for DRA PSP (#1914) More functions, lots of them are direct copies of the existing ones, or just tiny tweaks away. No de-duping at this stage since things are still pretty different.
2024-11-19 19:24:27 +00:00
SetGPUBuffRGBZero = 0x090F5230;
SetGPUBuffRGB = 0x090F5268;
func_800E34DC = 0x090F52A0;
SetStageDisplayBuffer = 0x090F5318;
SetCgiDisplayBuffer = 0x090F53A8;
SetMenuDisplayBuffer = 0x090F5440;
Add PSP DRA (#1119) Co-authored-by: sozud <122322823+sozud@users.noreply.github.com> Co-authored-by: bismurphy <tjmurphy@mit.edu>
2024-11-01 11:07:20 +00:00
MainGame = 0x090f5b58;
HandleTitle = 0x090f6800;
HandlePlay = 0x090f6b28;
HandleGameOver = 0x090f78c8;
HandleNowLoading = 0x090f8a08;
HandleVideoPlayback = 0x090f9b38;
nullsub_9 = 0x090f9f18;
HandlePrologueEnd = 0x090f9f20;
MainMenuHandler = 0x090f9fe0;
HandleEnding = 0x090fa228;
UpdateGame = 0x090fa660;
func_800EB758 = 0x090FC4E0;
RenderEntities = 0x090fd268;
DemoUpdate = 0x090ff738;
TimeAttackController = 0x09100458;
CheckEquipmentItemCount = 0x09100A58;
AddToInventory = 0x09100B68;
CheckAndDoLevelUp = 0x091012A8;
func_800FE044 = 0x091015B8;
IsRelicActive = 0x09101AA8;
func_800FE3C4 = 0x09101AF0;
GetEquipProperties = 0x09101DB0;
HasEnoughMp = 0x09101F60;
func_800FE8F0 = 0x09101FC8;
AddHearts = 0x09101FF0;
DealDamage = 0x09102C20;
RenderTilemap = 0x09103318;
SetRoomForegroundLayer = 0x09103B78;
SetRoomBackgroundLayer = 0x09103CF8;
LoadRoomLayer = 0x09103DF0;
func_800EAEA4 = 0x09103F08;
ResetPendingGfxLoad = 0x09103F90;
LoadGfxAsync = 0x09103FD8;
DecompressWriteNibble = 0x09104108;
DecompressReadNibble = 0x09104178;
DecompressData = 0x091041D0;
LoadPendingGfx = 0x09104478;
func_800EB4F8 = 0x09104628;
LoadEquipIcon = 0x09104648;
func_80109A44 = 0x091052B8;
EntityAlucard = 0x09106238;
UpdateUnarmedAnim = 0x09116CE0;
func_8010DBFC = 0x09116E40;
UpdateAnim = 0x091170F0;
func_8010DFF0 = 0x091175C8;
func_8010E0A8 = 0x091176C8;
func_8010E168 = 0x091177B0;
SetSpeedX = 0x09117B28;
GetFreeEntity = 0x09124828;
func_80118894 = 0x09124988;
func_80118970 = 0x09124B08;
func_80118B18 = 0x09124D28;
func_80118C28 = 0x09124F20;
func_8011A4D0 = 0x09127490;
CreateEntFactoryFromEntity = 0x09127C30;
StoreSaveData = 0x0913db20;
LoadSaveData = 0x0913e220;
DrawEntitiesHitbox = 0x0913e8b0;
func_80106A28 = 0x0913EC20;
LoadMonsterLibrarianPreview = 0x0913F780;
Working code-sharing for a file of PSP DRA and main DRA (#1895) Had to tweak some file splits, but ultimately I managed to decompile all of the functions in a PSP file, and then line up the two DRA codebases so that PSP could pull from the existing one. Of course, some of the functions also needed tweaking to end up matching on PSP. Glad to be able to prove this is possible in DRA!
2024-11-11 23:53:30 +00:00
func_80107250 = 0x0913F860;
Decompile PSP DRA SetPrimRect (#1860) I picked a random function from PSP and figured out what it was in PS1. Turns out it was one of these two. `SetPrimRect` and `SetTexturedPrimRect` happen to be pulled into a .h file already. The source code there required a line swap to get a PSP match. Interestingly, these are compiled with -O4. I'm guessing for now that functions with -O4 are grouped together into the same .c files (that is, some .c files were compiled with -O4, rather than some functions being -O4). Therefore, I adjusted the PSP makefile so that we can specify what object files use -O4. This is the same approach I used in Aironauts when I found some functions being GCC 2.7 and some being 2.8. Not sure if this will be the strongest approach long term, but I think that will become more clear as we begin crunching through PSP.
2024-11-01 12:32:23 +00:00
SetPrimRect = 0x0913F8D8;
SetTexturedPrimRect = 0x0913F908;
Add PSP DRA (#1119) Co-authored-by: sozud <122322823+sozud@users.noreply.github.com> Co-authored-by: bismurphy <tjmurphy@mit.edu>
2024-11-01 11:07:20 +00:00
func_80131F68 = 0x09140610;
Decompile PSP DRA file 63C90.c (#1861) Decided to tackle this whole file. It mostly matches with the existing DRA, so I've been back-porting the required changes to get the matches. Everything here matches in both. The only issue is the deadstripping, which we still need to figure out. I'm not sure why there's a file split at the end of this PSP file, where there isn't one in the PS1 game. I'll try removing the split once the functions are done on each side of the split. Also adjusted the makefile filter logic so that we only need to give the name of the file, rather than the full path. This makes the file list more concise. If we run into collisions (two files of the same name, in different overlays, which need different optimizations) we can revisit this.
2024-11-01 20:20:37 +00:00
SetReverbDepth = 0x09140638;
func_80131FCC = 0x09140640;
DoCdCommand = 0x09140698;
SetMaxVolume = 0x091407C0;
Add PSP DRA (#1119) Co-authored-by: sozud <122322823+sozud@users.noreply.github.com> Co-authored-by: bismurphy <tjmurphy@mit.edu>
2024-11-01 11:07:20 +00:00
InitSoundVars3 = 0x091407E0;
InitSoundVars2 = 0x091408E8;
func_80132A04 = 0x09140ff0;
PlaySfx = 0x09142fc8;
func_8013493C = 0x09143168;
func_801349F4 = 0x09143248;
func_80134B48 = 0x091433c8;
func_80134C60 = 0x091434a8;
func_80134D14 = 0x09143548;
func_80134E64 = 0x09143680;
ExecCdSoundCommands = 0x09143ED8;
CheckCollision = 0x09144C90;
g_ApiInit = 0x0914A628;
g_DraEntityTbl = 0x09183838;
g_SubwpnDefs = 0x09190EC8;
Decompile PSP version of func_801024DC (#1886) Picked a random `.c` file from PSP to decompile. This caused me to discover that this function requires `-O4,p`, which is new. All the other -O4 files also match with this, which is good. Also back-ported my changes to PS1. Some tiny changes to the texture displaying tools that I made due to xeeynamo finding a tiny bug; not worth a whole PR so I just tossed them into this one.
2024-11-08 20:11:45 +00:00
D_8013799C = 0x091CDC70;
D_801379A0 = 0x091CDC74;
D_801379A4 = 0x091CDC78;
D_801379A8 = 0x091CDC7C;
Decompile PSP DebugShowWaitInfo (#1899) Mostly an inconsequential function, but we can learn a whole lot from this one. 1. Lots more symbols added to PSP. This function touches a lot of previously-unseen things in PSP. 2. This is the first PSP function to print a string. Importantly, PSP puts strings in `data`, not `rodata`! Luckily, the process of pulling them in is simple and easy, as demonstrated here. 3. I modified the Makefile for the -O4 stuff. At this point I think DRA is `O4` and all the overlays are `O0`. We can always make the logic more complicated later if we need to. 4. We discovered a discrepancy in the size of DR_ENV on PSP. I suspect we will have more SDK differences, but we will find them function by function. I decided to set the size in a variable so that we can put all the version differences at the top of the file, instead of them being more scattered. I think that's it!
2024-11-13 18:06:22 +00:00
g_DebugWaitInfoTimer = 0x091CE268;
Add PSP DRA (#1119) Co-authored-by: sozud <122322823+sozud@users.noreply.github.com> Co-authored-by: bismurphy <tjmurphy@mit.edu>
2024-11-01 11:07:20 +00:00
D_80097420 = 0x091CE620;
g_MenuNavigation = 0x091cefd0;
D_80097C98 = 0x091ed280;
D_8003C0F8 = 0x091ed534;
g_DemoMode = 0x091fc420;
D_800973EC = 0x091fc428;
g_GameStep = 0x091fc448;
g_GameState = 0x091fc450;
Finish a .c file for DRA PSP (#1914) More functions, lots of them are direct copies of the existing ones, or just tiny tweaks away. No de-duping at this stage since things are still pretty different.
2024-11-19 19:24:27 +00:00
g_GpuBuffers = 0x091FC4E8;
Add PSP DRA (#1119) Co-authored-by: sozud <122322823+sozud@users.noreply.github.com> Co-authored-by: bismurphy <tjmurphy@mit.edu>
2024-11-01 11:07:20 +00:00
g_sfxRingBufferWritePos = 0x09236b80;
g_SfxRingBuffer = 0x09236b90;
g_SoundCommandRingBufferWritePos = 0x09237190;
g_SoundCommandRingBuffer = 0x092371A0;
D_8013AED4 = 0x092373A0;
D_8013B650 = 0x092373A8;
D_8013AEA0 = 0x092373B0;
D_8013B648 = 0x092373B8;
D_8013B628 = 0x092373D0;
D_8013B66C = 0x092373E8;
D_8013B5EC = 0x092373F8;
g_UnkChannelSetting2 = 0x09237408;
g_UnkChannelSetting1 = 0x09237418;
g_ChannelGroupVolume = 0x09237428;
D_8013B690 = 0x09237430;
Decompile PSP DRA file 63C90.c (#1861) Decided to tackle this whole file. It mostly matches with the existing DRA, so I've been back-porting the required changes to get the matches. Everything here matches in both. The only issue is the deadstripping, which we still need to figure out. I'm not sure why there's a file split at the end of this PSP file, where there isn't one in the PS1 game. I'll try removing the split once the functions are done on each side of the split. Also adjusted the makefile filter logic so that we only need to give the name of the file, rather than the full path. This makes the file list more concise. If we run into collisions (two files of the same name, in different overlays, which need different optimizations) we can revisit this.
2024-11-01 20:20:37 +00:00
D_8013901C = 0x092374B8;
Add PSP DRA (#1119) Co-authored-by: sozud <122322823+sozud@users.noreply.github.com> Co-authored-by: bismurphy <tjmurphy@mit.edu>
2024-11-01 11:07:20 +00:00
D_8013980C = 0x092374C8;
Decompile PSP DRA file 63C90.c (#1861) Decided to tackle this whole file. It mostly matches with the existing DRA, so I've been back-porting the required changes to get the matches. Everything here matches in both. The only issue is the deadstripping, which we still need to figure out. I'm not sure why there's a file split at the end of this PSP file, where there isn't one in the PS1 game. I'll try removing the split once the functions are done on each side of the split. Also adjusted the makefile filter logic so that we only need to give the name of the file, rather than the full path. This makes the file list more concise. If we run into collisions (two files of the same name, in different overlays, which need different optimizations) we can revisit this.
2024-11-01 20:20:37 +00:00
g_volumeL = 0x092374F0;
g_volumeR = 0x092374F8;
Add PSP DRA (#1119) Co-authored-by: sozud <122322823+sozud@users.noreply.github.com> Co-authored-by: bismurphy <tjmurphy@mit.edu>
2024-11-01 11:07:20 +00:00
g_SoundInitialized = 0x09237568;
D_8013B664 = 0x092375B0;
D_80139804 = 0x092375C8;
Decompile PSP DRA file 63C90.c (#1861) Decided to tackle this whole file. It mostly matches with the existing DRA, so I've been back-porting the required changes to get the matches. Everything here matches in both. The only issue is the deadstripping, which we still need to figure out. I'm not sure why there's a file split at the end of this PSP file, where there isn't one in the PS1 game. I'll try removing the split once the functions are done on each side of the split. Also adjusted the makefile filter logic so that we only need to give the name of the file, rather than the full path. This makes the file list more concise. If we run into collisions (two files of the same name, in different overlays, which need different optimizations) we can revisit this.
2024-11-01 20:20:37 +00:00
D_80138F7C = 0x092375F8;
D_8013B680 = 0x09237600;
g_CdCommandResult = 0x09237608;
g_CdCommandStatus = 0x09237610;
Add PSP DRA (#1119) Co-authored-by: sozud <122322823+sozud@users.noreply.github.com> Co-authored-by: bismurphy <tjmurphy@mit.edu>
2024-11-01 11:07:20 +00:00
D_8013B61C = 0x09237620;
g_RelicDefs = 0x09237628;
g_AccessoryDefs = 0x09237648;
g_EquipDefs = 0x09237650;
Reference in New Issue Copy Permalink