Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-11-23 13:09:44 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
75d5c6a1ba
sotn-decomp/config/symbols.stmad.txt

93 lines
2.8 KiB
Plaintext
Raw Normal View History

Clearer GameApi symbols (thanks @KernelEquinox)
2023-01-23 07:22:35 +00:00
g_SpriteBanks = 0x80180040;
Label shared entity across stages
2022-11-05 20:53:40 +00:00
g_pStTilesetDebug = 0x80180290;
Add two new functions from MAD
2022-01-24 00:19:58 +00:00
g_pStTileset = 0x801802A4;
Rename MAD Functions and Symbols (#1164) These were missed in 3b0943b25a9. Renames common stage functions for later refactor. Co-authored-by: Jonathan Hohle <jon@ttkb.co>
2024-05-23 19:21:49 +00:00
g_pStObjLayoutHorizontal = 0x801802F4;
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 = 0x8018049C;
Document EntityBreakable
2022-10-29 00:33:04 +00:00
g_eBreakableInit = 0x801804F0;
De-duplicate EntityUnkId13 (#1270) In the interest of reducing uses of `generic`, and especially the `entityPtr` member of it, I found this function which had several duplicates already, all of which used `generic`. Rather than cleaning it up in every instance, I decided instead to de-duplicate it, and then clean it up in the .h file. I needed to make a new entity extension for this, and noticed that we had `ET_Entity16`, but then I realized that this was being used for `g_Entities[16]`, so I renamed that to be `ET_EntitySlot16`, leaving `ET_EntityXX` available, for XX being the ID of an unknown entity.
2024-06-06 20:34:34 +00:00
g_InitDataEnt13 = 0x8018052C;
EntityRedDoor matching (#1167) Another One Bites the Dust It matches 1:1 with the PSP counterpart too: https://decomp.me/scratch/z1VlU
2024-05-24 18:41:07 +00:00
g_eInitGeneric2 = 0x80180544;
EntityDamageDisplay matching (#1161) Thanks a lot to @SestrenExsis for doing the majority of the function matching! I only take the credit for cross-referencing it with the PSP counterpart and massaging the code until I got a match on PSX.
2024-05-22 20:24:42 +00:00
g_eDamageDisplayInit = 0x80180550;
Document EntityBreakable
2022-10-29 00:33:04 +00:00
g_eBreakableAnimations = 0x80180644;
g_eBreakableHitboxes = 0x80180664;
g_eBreakableExplosionTypes = 0x8018066C;
Discover structs AnimationFrame and FrameProperty
2023-02-12 01:00:23 +00:00
g_eBreakableanimSets = 0x80180674;
ItemTypes to EquipKind and blendMode to drawMode (#999) [EquipKind](https://discord.com/channels/1079389589950705684/1087866009983139870/1196073673392652388) group decision [drawMode](https://discord.com/channels/1079389589950705684/1087866009983139870/1197935480428302476) group decision I was thinking a more soft PR, but in the light of `BLEND_VISIBLE` to `DRAW_HIDE`, a mass rename would have happened anyway. So I decided to rename everything since the majority of the code stands on the same line of `BLEND_VISIBLE`. The only changes other than the mass rename are: ```c #define blendMode drawMode // maintained to easily migrate existing scratches ``` this might or not be useful . ```c #define DRAW_DEFAULT 0x00 #define DRAW_TRANSP 0x01 // make it semi transparent #define DRAW_COLORS 0x04 // use color blending #define DRAW_HIDE 0x08 // do not render the primitive #define DRAW_TPAGE 0x10 // use custom tpage #define DRAW_NOMENU 0x80 // do not render if D_800973EC is set #define DRAW_ABSPOS 0x2000 // use absolute coordinates with DRAW_NOMENU ``` This is based on the research from the [RenderPrimitives](https://decomp.me/scratch/geI8L) function.
2024-01-20 21:16:03 +00:00
g_eBreakableDrawModes = 0x80180684;
De-duplicate EntityBigRedFireball (#1207) This is an entity that is in every overlay, but appears to be unused, at least so far. It looks just like Gaibon's big fireball (in his second form), but that is handled by a different entity. Presumably we will find its use in a future overlay. I also made some general improvements to the function, such as turning the weird bit shifting into a simple division by 4, thus eliminating the variables. I also created an entity extension for this entity. Another victory for my automated deduplicator.
2024-05-29 03:29:41 +00:00
g_bigRedFireballAnim = 0x80180E40;
De-duplicate CollectGold (#1211) This one had some small differences in MAD and ST0, so I worked them in as ifdef. Also, I cleaned up the function a bit, by removing the unneeded pointers. The GoldSizeIndex local variable is unneeded. It is possible to just use the goldSize argument, and do `-=2`, but I think using the local variable makes it more readable, so I left it in place.
2024-05-30 16:42:24 +00:00
g_goldCollectTexts = 0x80180D60;
c_GoldPrizes = 0x80180D88;
Deduplicate EntityUnkId14Spawner (#1204) This spawns several copies of EntityUnkId14, very similarly to the existing EntityUnkId15Spawner. Most of the work for this PR (renaming all the functions, cross-referencing symbols across overlays) was done by an automated script I made. I am still testing this script, but it is nice to see that it appears to be starting to work. I will test it on a few more de-duplication PRs, and then consider adding it to the `tools` directory.
2024-05-28 17:31:01 +00:00
g_eUnk14SpawnRots = 0x80180FAC;
De-duplicate EntityUnkId14 (#1203) Fairly standard function de-duplication PR. Starting to get kind of good at these! I might look into automating parts of this process to make it go faster... Next I'll be doing the unkId14 spawner, which is just like the existing unkid15 spawner.
2024-05-28 01:24:59 +00:00
unk14_yVel = 0x80180FE4;
unk14_startFrame = 0x80180FFC;
unk14_lifetime = 0x80181000;
Refactor Unkown Entity 15 (#1265) Co-authored-by: Jonathan Hohle <jon@ttkb.co>
2024-06-06 20:07:25 +00:00
unk15_rot = 0x80180FBC;
unk15_yVel = 0x80180FCC;
Extract g_Rooms for all the overlays
2023-03-13 20:56:36 +00:00
g_Rooms = 0x80181130;
EntityRedDoor matching (#1167) Another One Bites the Dust It matches 1:1 with the PSP counterpart too: https://decomp.me/scratch/z1VlU
2024-05-24 18:41:07 +00:00
g_eRedDoorTiles = 0x80180594;
Deduplicate EntityOlroxDrool (#1205) Another nice de-duplication. Cool to dig into these functions and see what they do. Continuing working on my automated de-duplication script. This one was definitely much easier because of it. I didn't have to track down a single symbol. In fact, most of my time putting this together was just commenting in the .h file.
2024-05-29 00:42:15 +00:00
g_olroxDroolCollOffsets = 0x80181008;
Add two new functions from MAD
2022-01-24 00:19:58 +00:00
g_pStrObjLayout0 = 0x801811D4;
g_pStrObjLayout1 = 0x801811E8;
g_pStrObjLayout2 = 0x80181206;
g_pStrObjLayout3 = 0x801812B0;
g_pStrObjLayout4 = 0x8018135A;
g_pStrObjLayout5 = 0x80181404;
g_pStrObjLayout6 = 0x801814AE;
g_pStrObjLayout7 = 0x80181558;
g_pStrObjLayout8 = 0x80181602;
g_pStrObjLayout9 = 0x801816AC;
g_pStrObjLayout10 = 0x80181756;
g_pStrObjLayout11 = 0x80181774;
g_pStrObjLayout12 = 0x80181788;
g_pStrObjLayout13 = 0x801817A6;
g_pStrObjLayout14 = 0x80181850;
g_pStrObjLayout15 = 0x801818FA;
g_pStrObjLayout16 = 0x801819A4;
g_pStrObjLayout17 = 0x80181A4E;
g_pStrObjLayout18 = 0x80181AF8;
g_pStrObjLayout19 = 0x80181BA2;
g_pStrObjLayout20 = 0x80181C4C;
More insight on how objects are loaded from a map overlay
2022-01-31 17:42:53 +00:00
g_pStrObjLayout21 = 0x80181CF6;
Discover g_zEntityCenter field
2022-10-29 00:13:38 +00:00
EntityBreakable = 0x8018E830;
Clearer GameApi symbols (thanks @KernelEquinox)
2023-01-23 07:22:35 +00:00
Update = 0x8018E994;
Rename TestCollisions to HitDetection (#1193) This is a simple find-and-replace to rename this function to more accurately indicate its purpose.
2024-05-27 17:01:30 +00:00
HitDetection = 0x8018EDB8;
EntityDamageDisplay matching (#1161) Thanks a lot to @SestrenExsis for doing the majority of the function matching! I only take the credit for cross-referencing it with the PSP counterpart and massaging the code until I got a match on PSX.
2024-05-22 20:24:42 +00:00
EntityDamageDisplay = 0x8018FEA0;
Clearer GameApi symbols (thanks @KernelEquinox)
2023-01-23 07:22:35 +00:00
InitRoomEntities = 0x80190D8C;
Discover EntityRedDoor
2022-11-05 21:00:42 +00:00
EntityRedDoor = 0x80191120;
Reverse engineer how the entity Candle works
2022-02-06 16:35:17 +00:00
DestroyEntity = 0x80191D3C;
Discover MoveEntity
2022-03-03 23:38:38 +00:00
MoveEntity = 0x801920F0;
Discover FallEntity
2022-02-12 16:39:07 +00:00
FallEntity = 0x80192120;
Reverse engineer how the entity Candle works
2022-02-06 16:35:17 +00:00
InitializeEntity = 0x80192CAC;
Label shared entity across stages
2022-11-05 20:53:40 +00:00
EntityDummy = 0x80192DA8;
EntityPrizeDrop matching
2023-03-25 20:37:41 +00:00
EntityPrizeDrop = 0x801939E0;
Label shared entity across stages
2022-11-05 20:53:40 +00:00
EntityExplosion = 0x80194218;
Remaining EntityEquipItemDrop duplicates (#165)
2023-03-26 15:25:05 +00:00
EntityEquipItemDrop = 0x801943EC;
Document entities
2023-01-05 19:35:01 +00:00
EntityRelicOrb = 0x801949C0;
EntityHeartDrop = 0x80195520;
De-duplicate EntityUnkId13 (#1270) In the interest of reducing uses of `generic`, and especially the `entityPtr` member of it, I found this function which had several duplicates already, all of which used `generic`. Rather than cleaning it up in every instance, I decided instead to de-duplicate it, and then clean it up in the .h file. I needed to make a new entity extension for this, and noticed that we had `ET_Entity16`, but then I realized that this was being used for `g_Entities[16]`, so I renamed that to be `ET_EntitySlot16`, leaving `ET_EntityXX` available, for XX being the ID of an unknown entity.
2024-06-06 20:34:34 +00:00
EntityUnkId13 = 0x8019572C;
Discover EntityIntenseExplosion
2022-11-05 21:09:21 +00:00
EntityIntenseExplosion = 0x801964E4;
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 = 0x801982BC;
Discover EntityEnemyBlood
2022-11-05 21:04:00 +00:00
EntityEnemyBlood = 0x80198650;
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
EntityRoomForeground = 0x80198B00;
GetSideToPlayer = 0x801920AC;
Some dups progress (#448) After attempting this de-duplication process I see that it's pretty slow, tedious and error-prone. I think it would make sense to have an intermediate phase where we split stuff into #includes like this PR does. Eventually this will be combined back into C files with proper file splits. I think a process that is incremental and would get us there eventually could be like this: Split single function into a header, #include it. Rename any D_XXXXXXX variables to UNK_Whatever#, add to symbols.*.txt Once the above is done for all instances of the function, perform file splits (if we know there's a sequential block of functions, wait to split until the whole block is done) Combine individual.h files into a c file, integrate building st/shared_#.c into Makefile I'm probably just going to do a little bit on this each day to try and chip away at it, it's too tedious to do a big push.
2023-08-07 23:33:22 +00:00
UNK_Invincibility0 = 0x801806B4;
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 = 0x80199E54;
MAD EntityRelicOrb (#534) Similar to #520 and #529 but this decompiles the version in MAD. The biggest difference is how the character sequence is decoded. In the US version it looks like they splitted chunks of code into smaller functions. I tried to put these chunk of codes into functions using the `inline` keyword but I got reg swaps and instructions moved. This confirms MAD was part of the Japanese build. Due to the file timestamp and the name `symbols.beta.txt` I decided to assign to it `VERSION_BETA`.
2023-08-31 21:55:23 +00:00
g_InitializeEntityData0 = 0x80180508;
g_InitializeData0 = 0x801804FC;
MAD func_8019bed4 (#806) Follow-up to #797 by decompiling the MAD counterpart and share all the functions within the same file. I renamed the function as `UnkPrimHelper` as I do not know what it does.
2023-11-23 20:04:41 +00:00
g_UnkPrimHelperRot = 0x8018D8C0;
UnkPrimHelper = 0x80198FA0;
De-duplicate EntityUnkId14 (#1203) Fairly standard function de-duplication PR. Starting to get kind of good at these! I might look into automating parts of this process to make it go faster... Next I'll be doing the unkId14 spawner, which is just like the existing unkid15 spawner.
2024-05-28 01:24:59 +00:00
EntityUnkId14 = 0x80195A54;
Decompile NO3 EntityUnkId15 & dedupe EntityUnkId15Spawner (#941) - Decompile NO3 func_801C8C84 - Dedupe EntityUnkId15Spawner (+ some entity enum normalization)
2024-01-02 16:08:30 +00:00
EntityUnkId15 = 0x80195B44;
Deduplicate functions and un-fake use of some Primitive structs (#991)
2024-01-18 19:04:04 +00:00
UnkPolyFunc2 = 0x801996EC;
EntityStageNamePopup (#994) Decompile and de-duplicate EntityStageNamePopup for all the overlays the function is in. I also detected a helper function I renamed as `PrimDecreaseBrightness` that was originally accepting a completely wrong parameter type. This helped me to get rid of `Unkstruct_80128BBC` too.
2024-01-19 03:07:13 +00:00
PrimDecreaseBrightness = 0x8019976C;
Rename Stage Layout Functions and Vars Uniformly (#1162) This change renames functions and global stage variables uniformly across the stages so that these functions can be pulled out and shared across all of the stages. Based on some other tests there are 12 or so functions that this will allow to be pulled out of each stage. Since these implementations are shared, an additional 12 asm functions can be eliminated in a subsequent pass. **Vars** * `g_pStObjLayoutHorizontal` - a horizontally sorted array of stage entities * `g_pStObjLayoutVertical` - a vertically sorted array of stage entities * `g_LayoutObjHorizontal` - a pointer to a `LayoutEntity` in `g_pStObjLayoutHorizontal` * `g_LayoutObjVertical` - a pointer to a `LayoutEntity` in `g_pStObjLayoutVertical` * `g_LayoutObjPosHorizontal` - the direction last traversed in `g_LayoutObjHorizontal` * `g_LayoutObjPosVertical` - the direction last traversed in `g_pStObjLayoutVertical ` **Functions** * `FindFirstEntityToTheRight` - given an `x` position, update `g_LayoutObjHorizontal` with the first entity to the right of `x` * `FindFirstEntityToTheLeft` - given a `x` position, update `g_LayoutObjHorizontal` with the first entity to the left of `x` (backwards) * `CreateEntitiesToTheRight` - given an `x` position, create all entities to the right (mutates `g_LayoutObjHorizontal`) * `CreateEntitiesToTheLeft` - given an `x` position, create all entities to the left (mutates `g_LayoutObjHorizontal`) * `FindFirstEntityAbove` - given an `y` position, update `g_LayoutObjVertical ` with the first entity to the above of `y` * `FindFirstEntityBelow` - given an `y` position, update `g_LayoutObjVertical ` with the first entity to the below of `y` * `CreateEntitiesAbove` - given an `y` position, create all entities above (mutates `g_LayoutObjVertical`) * `CreateEntitiesBelow` - given an `y` position, create all entities beneath (mutates `g_LayoutObjVertical`) * `UpdateRoomPosition` - look at the current game loop scroll delta and create any entities given the room layout I believe all of these implementations are shared across all stages (including `InitRoomEntities`, and two more `CreateEntity` functions) (in my initial tests I had a small difference in `DER`, but I believe that had to do with an incorrect symbol table change). Co-authored-by: Jonathan Hohle <jon@ttkb.co>
2024-05-22 22:34:41 +00:00
g_LayoutObjHorizontal = 0x801997D8;
g_LayoutObjPosHorizontal = 0x801997E0;
g_LayoutObjVertical = 0x801997DC;
g_LayoutObjPosVertical = 0x801997E4;
UpdateRoomPosition = 0x80190F04;
Rename MAD Functions and Symbols (#1164) These were missed in 3b0943b25a9. Renames common stage functions for later refactor. Co-authored-by: Jonathan Hohle <jon@ttkb.co>
2024-05-23 19:21:49 +00:00
g_pStObjLayoutVertical = 0x801803C8;
WRP PSP e_particles (#1227) Quite a big one. I merged `EntitySoulStealOrb` across all overlays by normalising the symbol names. The symbol types was all over the place, so I had to fix that as well. I solved the s16/u16 ifdef between PSX and PSP. The only part I couldn't match without a ifdef was `angle = (angle - 1) * 8;` and `angle = (angle * 8) - 8;`. I also decompiled the exclusive PSP functions `func_psp_0923AD68` and `func_psp_0923B2F0` and merged the PSX and PSP `e_particles.c` code. The exclusive functions required a file split.
2024-06-01 19:32:59 +00:00
g_ESoulStealOrbAngles = 0x80181068;
g_ESoulStealOrbAnim = 0x801810D8;
g_ESoulStealOrbSprt = 0x80181078;
Refactor Entity Explosion (#1273) Pulls out `EntityExplosion` into a common file. `cen` and `rwrp` appear to have not imported a declaration for `AnimateEntity` and call it as an undeclared function with a int-sized return value. Since `AnimateEntity` is declared in the same compilation unit a workaround is done to fix how the return value is interpreted.
2024-06-07 00:19:52 +00:00
g_ExplosionYVelocities = 0x80180E18;
g_ExplosionAnimations = 0x80180EC4;
MAD quick matches (#1287) small quick wins
2024-06-08 22:02:00 +00:00
UpdateStageEntities = 0x8018EC90;
Reference in New Issue Copy Permalink