Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-11-27 15:00:36 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
4adf1da469
sotn-decomp/config/symbols.us.stcen.txt

65 lines
1.9 KiB
Plaintext
Raw Normal View History

Clearer GameApi symbols (thanks @KernelEquinox)
2023-01-23 07:22:35 +00:00
g_SpriteBanks = 0x80180040;
Fix PfnEntityUpdates address across overlays (#339) Thanks to the disassembly of the Saturn version (kudos to @sozud), I realised how we got some fake matches in the PSX all along. https://github.com/Xeeynamo/sotn-decomp/blob/e567920005b4dd7a23a6c39e4bfbe7951c9e163d/src/saturn/game.c#L716 Following the pattern from the Saturn version I was able to confirm my theory to use `objectId - 1` and fix some oddities I found while I was importing the `.data` section from PSX WRP: https://github.com/Xeeynamo/sotn-decomp/blob/e567920005b4dd7a23a6c39e4bfbe7951c9e163d/src/st/wrp/6FD0.c#L200
2023-07-09 20:29:10 +00:00
PfnEntityUpdates = 0x80180394;
Dedupe EntityEnemyBlood (#487)
2023-08-20 20:35:01 +00:00
g_InitializeData0 = 0x80180410;
De-duplicate EntityIntenseExplosion (#480)
2023-08-18 23:37:55 +00:00
g_InitializeEntityData0 = 0x8018041C;
Decompile Update() for rwrp and cen (#451)
2023-08-08 17:24:44 +00:00
UNK_Invincibility0 = 0x801807B8;
Resolve remaining duplicates for CollectGold (#514) Most overlays have the same CollectGold function (st0 is an odd one out, there may be others). I noticed in the duplicates report (https://raw.githubusercontent.com/Xeeynamo/sotn-decomp/gh-duplicates/duplicates.txt) that there were 3 overlays which still had placeholders in. This PR resolves that and finishes decompiling all of them. The C code in all of these is copied from the `wrp` version, if it matters. Symbols have been changed to account for different data locations across overlays. I have attempted to be as formulaic as possible with these. In most of these, there is a function which is called at the end of the function. In the `cen` version, it is `func_8019BBA4`. I have also decompiled that function in every overlay, so once this PR is in, I will submit another for those functions.
2023-08-26 19:15:59 +00:00
c_GoldPrizes = 0x80180F58;
Extract g_Rooms for all the overlays
2023-03-13 20:56:36 +00:00
g_Rooms = 0x801812D4;
Format code
2023-05-06 01:16:56 +00:00
EntityBackgroundBlock = 0x8018D600;
EntityUnkId12 = 0x8018D6E0;
EntityUnkId01 = 0x8018D89C;
EntityUnkId16 = 0x8018E7C8;
EntityPlatform = 0x8018F95C;
EntityRoomDarkness = 0x8019007C;
EntityMaria = 0x80190374;
EntityElevatorStationary = 0x80190540;
EntityUnkId1B = 0x80190A78;
EntityMovingElevator = 0x80190B64;
CEN2 (#41) more work on small CEN functions
2023-01-21 13:16:35 +00:00
Random = 0x80190E4C;
Decompile Update() for rwrp and cen (#451)
2023-08-08 17:24:44 +00:00
Update = 0x80190E7C;
Rename UpdateStageEntities (#453) I wasn't able to get this to work for MAD for some reason. Splat wouldn't extract the asm under the new filename.
2023-08-08 19:12:12 +00:00
UpdateStageEntities = 0x80191178;
Rename TestCollisions (#455)
2023-08-08 19:55:12 +00:00
TestCollisions = 0x80191280;
Format code
2023-05-06 01:16:56 +00:00
EntityNumericDamage = 0x80192398;
Dedupe CreateEntityFromLayout (#459)
2023-08-09 18:59:29 +00:00
CreateEntityFromLayout = 0x80192A3C;
Format code
2023-05-06 01:16:56 +00:00
CreateEntityWhenInVerticalRange = 0x80192B00;
CreateEntityWhenInHorizontalRange = 0x80192C18;
InitRoomEntities and duplicates matching This was a function I started decompiling months ago. Today I was finally able to match it. Thanks to @sonicdcer for dealing the last reg swap. I was stumbling too hard on it without success. I had to change the type of LayoutObject* into u16* or it would not match otherwise. Co-authored-by: sonicdcer <sonicdcer@users.noreply.github.com>
2023-06-29 22:55:22 +00:00
InitRoomEntities = 0x80193298;
Format code
2023-05-06 01:16:56 +00:00
CreateEntityFromCurrentEntity = 0x801934C4;
CEN Functions (#327) Functions: EntityRoomDarkness func_8018DB18 EntityUnkId01 func_8019040C EntityUnkId1B
2023-07-07 16:33:20 +00:00
CreateEntityFromEntity = 0x80193538;
Format code
2023-05-06 01:16:56 +00:00
EntityRedDoor = 0x8019362C;
Decompile func_8018F510 and similar across all overlays
2023-01-21 14:13:45 +00:00
DestroyEntity = 0x80194264;
Dedupe ReplaceBreakableWithItemDrop (#483)
2023-08-19 21:06:57 +00:00
PreventEntityFromRespawning = 0x8019434C;
Rename GetDistanceToPlayer and GetSideToPlayer (#350) As we decided on Discord (https://discord.com/channels/1079389589950705684/1087866009983139870/1125555095778644039) I mass-renamed `GetPlayerDistance` into `GetDistanceToPlayer` and `GetPlayerSide` into `GetSideToPlayer`. I also took the opportunity to tweak the comments and add the symbols to the missing overlays.
2023-07-12 07:18:59 +00:00
GetDistanceToPlayerX = 0x80194564;
GetDistanceToPlayerY = 0x801945A0;
GetSideToPlayer = 0x801945D4;
EntityEnemyBlood duplicates (#177)
2023-04-07 08:58:23 +00:00
MoveEntity = 0x80194618;
Format code
2023-07-07 18:05:39 +00:00
FallEntity = 0x80194648;
Decompile func_8018F510 and similar across all overlays
2023-01-21 14:13:45 +00:00
AllocEntity = 0x80194AD4;
Dedupe EntityEnemyBlood (#487)
2023-08-20 20:35:01 +00:00
UnkEntityFunc0 = 0x80194D08;
CollectSubweapon + duplicates (#326) This function was already decompiled for ST0, it was reviewed and merged in a previous PR, The one for the MAD overlay is a duplicate of the same func. As for the rest of the overlays, the function calls SetStep instead of just modifying the Current Entity step and step_s directly, so with that little change the "normal" version of the function is now decompiled.
2023-07-07 16:25:55 +00:00
SetStep = 0x80194EA4;
Decompile func_8018F510 and similar across all overlays
2023-01-21 14:13:45 +00:00
InitializeEntity = 0x80194F74;
Format code
2023-05-06 01:16:56 +00:00
CollectHeart = 0x801958F4;
Resolve remaining duplicates for CollectGold (#514) Most overlays have the same CollectGold function (st0 is an odd one out, there may be others). I noticed in the duplicates report (https://raw.githubusercontent.com/Xeeynamo/sotn-decomp/gh-duplicates/duplicates.txt) that there were 3 overlays which still had placeholders in. This PR resolves that and finishes decompiling all of them. The C code in all of these is copied from the `wrp` version, if it matters. Symbols have been changed to account for different data locations across overlays. I have attempted to be as formulaic as possible with these. In most of these, there is a function which is called at the end of the function. In the `cen` version, it is `func_8019BBA4`. I have also decompiled that function in every overlay, so once this PR is in, I will submit another for those functions.
2023-08-26 19:15:59 +00:00
CollectGold = 0x80195974;
CollectSubweapon + duplicates (#326) This function was already decompiled for ST0, it was reviewed and merged in a previous PR, The one for the MAD overlay is a duplicate of the same func. As for the rest of the overlays, the function calls SetStep instead of just modifying the Current Entity step and step_s directly, so with that little change the "normal" version of the function is now decompiled.
2023-07-07 16:25:55 +00:00
CollectSubweapon = 0x80195A50;
EntityPrizeDrop matching
2023-03-25 20:37:41 +00:00
EntityPrizeDrop = 0x80195C84;
Format code
2023-05-06 01:16:56 +00:00
EntityExplosion = 0x801964F8;
EntityRelicOrb duplicates (#529) As I finished importing the data in WRP, I came with a possible new pattern when de-duplicating functions. I kept using a header file (easily indexable from VS Code) in `src/st`. But this time it gets included by `entity_relic_orb.c`. All the sections `.data`, `.rodata` and `.text` are migrated into `entity_relic_orb.c` but the file itself just includes `src/st/entity_relic_orb.h`. Thinking forward, once we will be able to fix the problem present in #464 it will just be a matter of renaming `entity_relic_orb.h` into `entity_relic_orb.c` and remove each individual `entity_relic_orb.c` that currently acts as a proxy. ~~This PR is a draft. If you agree this is a good pattern I will proceed to do the same with the remaining overlays after #528 is good to be merged.~~
2023-08-30 18:59:19 +00:00
BlinkItem = 0x801965F4;
Remaining EntityEquipItemDrop duplicates (#165)
2023-03-26 15:25:05 +00:00
EntityEquipItemDrop = 0x80196698;
EntityRelicOrb duplicates (#529) As I finished importing the data in WRP, I came with a possible new pattern when de-duplicating functions. I kept using a header file (easily indexable from VS Code) in `src/st`. But this time it gets included by `entity_relic_orb.c`. All the sections `.data`, `.rodata` and `.text` are migrated into `entity_relic_orb.c` but the file itself just includes `src/st/entity_relic_orb.h`. Thinking forward, once we will be able to fix the problem present in #464 it will just be a matter of renaming `entity_relic_orb.h` into `entity_relic_orb.c` and remove each individual `entity_relic_orb.c` that currently acts as a proxy. ~~This PR is a draft. If you agree this is a good pattern I will proceed to do the same with the remaining overlays after #528 is good to be merged.~~
2023-08-30 18:59:19 +00:00
BlitChar = 0x80196C80;
Document some CEN entities (#141)
2023-03-08 18:18:02 +00:00
EntityRelicOrb = 0x80196F30;
EntityHeartDrop (#169)
2023-03-28 17:36:14 +00:00
EntityHeartDrop = 0x80197A00;
Document some CEN entities (#141)
2023-03-08 18:18:02 +00:00
EntityUnkId0E = 0x80197B28;
EntityUnkId13 = 0x80198174;
EntityExplosion14 = 0x8019849C;
EntityUnkId15 = 0x8019858C;
Format code
2023-05-06 01:16:56 +00:00
EntityIntenseExplosion = 0x80198F2C;
NON_MATCHING ClutLerp and its duplicates (#224) The function creates a number of CLUTs by linearly interpolating between two existing CLUTs.
2023-05-09 18:08:16 +00:00
ClutLerp = 0x8019A130;
Format code
2023-05-06 01:16:56 +00:00
EntityStageNamePopup = 0x8019A5F0;
Match duplicates of EntityAbsorbOrb (#245) This pull request matches the following functions, which are all duplicates of previously decompiled functions: - DRE - `EntityAbsorbOrb` - Renamed to `EntitySoulStealOrb` - MAD - `EntityAbsorbOrb` - Renamed to `EntitySoulStealOrb` - NO3 - `EntityAbsorbOrb` - Renamed to `EntitySoulStealOrb` - NP3 - `EntityAbsorbOrb` - Renamed to `EntitySoulStealOrb` - NZ0 - `EntityAbsorbOrb` - Renamed to `EntitySoulStealOrb` - ST0 - `EntityAbsorbOrb` - Renamed to `EntitySoulStealOrb` - WRP - `EntityAbsorbOrb` - Renamed to `EntitySoulStealOrb` - RWRP - `func_80194590` - Renamed to `EntitySoulStealOrb`
2023-06-10 16:44:16 +00:00
EntitySoulStealOrb = 0x8019B274;
Format code
2023-05-06 01:16:56 +00:00
EntityEnemyBlood = 0x8019B608;
EntityUnkId08 = 0x8019BAB8;
Decompile ST0 func_801BA7D8 (#515) This is an unknown function. I don't know what it does. It is duplicated across most overlays. It is called in CollectGold, EntityEquipItemDrop, and TestCollisions. It seems to take in a string, and then do a bunch of things with primitives, but I don't know what. We don't directly reference that array, we only read and write to it based on a pointer which moves through the array. I tried to remove the pointer but didn't get anywhere. Fully-matching scratch is here: https://decomp.me/scratch/UV2K2 I am starting with only this one version of the function, so that if changes need to be made (variable names, control flow, etc), I can update them once here, and then copy them to the other places, instead of making changes in every place. Once we are happy with the state of this function, I will add the duplicates to this PR prior to merging. --------- Co-authored-by: bismurphy <bismurphy@users.noreply.github.com>
2023-08-27 01:30:57 +00:00
BottomCornerText = 0x8019BBA4;
Dedupe UnkPolyFunc0 (#500)
2023-08-22 21:12:53 +00:00
UnkPolyFunc0 = 0x8019C674;
De-duplicate UnkLoopFunc (#479) I'm open to ideas on the name.
2023-08-18 23:57:00 +00:00
UnkLoopFunc = 0x8019C6A0;
WRP EntityRelicOrb matching (#520) Took me a while. I had to move a good chunk of the data from 6FD0 due to `const char* D_80180F84[] = {"Obtained "};` as it declares data in both `.data` and `.rodata`. Due to its strategic location, I did not yet find a clean way to have it matching in other overlays without starting to import data. The function is not very clean and there are loads of temp variables and fake stuff. I ask to spend a bit of time to make improvements where possible. I want to get it in a good shape before committing myself to de-duplicating it for all the other overlays. https://decomp.me/scratch/kyBr8
2023-08-28 22:53:45 +00:00
g_ItemIconSlots = 0x8019D42C;
Reference in New Issue Copy Permalink