Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-10-07 02:24:01 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity
5fab2ecb0e
sotn-decomp/config/symbols.pspeu.stwrp.txt

137 lines
4.2 KiB
Plaintext
Raw Normal View History

Add ST/WRP from PSP (#1172) Extract ST/WRP out of #1119 . All the function symbols should have been cross-referenced. There as some PSX functions missing from PSP and some new functions from PSP that are not present on PSX (e.g. `st_init_wrp.c`). The files `st_debug.c` and `e_breakable.c` are shared between WRP PSX and WRP PSP. Everything else from PSP is isolated into its own folder. I had to do some tricks on the YAML config to allow shared code. `ST_WRP_MERGE = st_debug e_breakable` in the `Makefile` is a bit annoying as MWCC complains about every single minute detail from the C source that has been already decompiled for the PSX US build. `EntityWarpSmallRocks` is matching on PSP but I couldn't extract the rodata without having a bunch of linker errors. This might be a Splat issue. I need to investigate further. `func_psp_09244760` is soooo interesting. The values from `0x11` to `0x17` matches the Entity IDs that are unique to the WRP overlay. This aligns to what we have in `typedef enum EntityIDs`. Overall I am very excited to the recent discoveries from the PSP build!
2024-05-25 18:56:06 +00:00
CreateEntityFromLayout = 0x09237700;
CreateEntityWhenInVerticalRange = 0x09237820;
CreateEntityWhenInHorizontalRange = 0x092379b8;
FallEntity (#1174) I get ``` mipsel-linux-gnu-ld: build/pspeu/src/st/wrp_psp/BF50.c.o: in function `FallEntity': (.text+0x0): undefined reference to `g_CurrentEntity' mipsel-linux-gnu-ld: (.text+0x4): undefined reference to `g_CurrentEntity' mipsel-linux-gnu-ld: (.text+0x1c): undefined reference to `g_CurrentEntity' mipsel-linux-gnu-ld: (.text+0x20): undefined reference to `g_CurrentEntity' ``` Not sure what the issue is
2024-05-26 12:26:51 +00:00
FindFirstEntityToTheRight = 0x09237b50;
FindFirstEntityToTheLeft = 0x09237bc0;
PSP WRP functions (#1178) A bunch of functions where I am using the shared headers whenever I could. The plan is to switch into C files on the first good opportunity.
2024-05-26 18:58:12 +00:00
CreateEntitiesToTheRight = 0x09237c48;
CreateEntitiesToTheLeft = 0x09237d88;
FallEntity (#1174) I get ``` mipsel-linux-gnu-ld: build/pspeu/src/st/wrp_psp/BF50.c.o: in function `FallEntity': (.text+0x0): undefined reference to `g_CurrentEntity' mipsel-linux-gnu-ld: (.text+0x4): undefined reference to `g_CurrentEntity' mipsel-linux-gnu-ld: (.text+0x1c): undefined reference to `g_CurrentEntity' mipsel-linux-gnu-ld: (.text+0x20): undefined reference to `g_CurrentEntity' ``` Not sure what the issue is
2024-05-26 12:26:51 +00:00
FindFirstEntityAbove = 0x09237ee0;
FindFirstEntityBelow = 0x09237f58;
PSP WRP functions (#1178) A bunch of functions where I am using the shared headers whenever I could. The plan is to switch into C files on the first good opportunity.
2024-05-26 18:58:12 +00:00
CreateEntitiesAbove = 0x09237fe0;
CreateEntitiesBelow = 0x09238128;
Add ST/WRP from PSP (#1172) Extract ST/WRP out of #1119 . All the function symbols should have been cross-referenced. There as some PSX functions missing from PSP and some new functions from PSP that are not present on PSX (e.g. `st_init_wrp.c`). The files `st_debug.c` and `e_breakable.c` are shared between WRP PSX and WRP PSP. Everything else from PSP is isolated into its own folder. I had to do some tricks on the YAML config to allow shared code. `ST_WRP_MERGE = st_debug e_breakable` in the `Makefile` is a bit annoying as MWCC complains about every single minute detail from the C source that has been already decompiled for the PSX US build. `EntityWarpSmallRocks` is matching on PSP but I couldn't extract the rodata without having a bunch of linker errors. This might be a Splat issue. I need to investigate further. `func_psp_09244760` is soooo interesting. The values from `0x11` to `0x17` matches the Entity IDs that are unique to the WRP overlay. This aligns to what we have in `typedef enum EntityIDs`. Overall I am very excited to the recent discoveries from the PSP build!
2024-05-25 18:56:06 +00:00
InitRoomEntities = 0x09238288;
PSP WRP functions (#1178) A bunch of functions where I am using the shared headers whenever I could. The plan is to switch into C files on the first good opportunity.
2024-05-26 18:58:12 +00:00
UpdateRoomPosition = 0x092384b8;
Add ST/WRP from PSP (#1172) Extract ST/WRP out of #1119 . All the function symbols should have been cross-referenced. There as some PSX functions missing from PSP and some new functions from PSP that are not present on PSX (e.g. `st_init_wrp.c`). The files `st_debug.c` and `e_breakable.c` are shared between WRP PSX and WRP PSP. Everything else from PSP is isolated into its own folder. I had to do some tricks on the YAML config to allow shared code. `ST_WRP_MERGE = st_debug e_breakable` in the `Makefile` is a bit annoying as MWCC complains about every single minute detail from the C source that has been already decompiled for the PSX US build. `EntityWarpSmallRocks` is matching on PSP but I couldn't extract the rodata without having a bunch of linker errors. This might be a Splat issue. I need to investigate further. `func_psp_09244760` is soooo interesting. The values from `0x11` to `0x17` matches the Entity IDs that are unique to the WRP overlay. This aligns to what we have in `typedef enum EntityIDs`. Overall I am very excited to the recent discoveries from the PSP build!
2024-05-25 18:56:06 +00:00
CreateEntityFromCurrentEntity = 0x09238598;
CreateEntityFromEntity = 0x09238620;
EntityStageNamePopup = 0x092386a8;
EntityIsNearPlayer = 0x09239528;
EntityRedDoor = 0x09239610;
Random = 0x0923a830;
Update = 0x0923a870;
UpdateStageEntities = 0x0923ac50;
EntitySoulStealOrb = 0x0923b780;
EntityEnemyBlood = 0x0923bce0;
BlitChar = 0x0923c3d0;
Dedupe PrizeDropFall (#1714) Progress towards fixing CEN HD
2024-10-02 19:10:44 +00:00
PrizeDropFall = 0x0923c988;
Dedupe PrizeDropFall2 (#1715)
2024-10-02 21:39:01 +00:00
PrizeDropFall2 = 0x0923ca60;
Add ST/WRP from PSP (#1172) Extract ST/WRP out of #1119 . All the function symbols should have been cross-referenced. There as some PSX functions missing from PSP and some new functions from PSP that are not present on PSX (e.g. `st_init_wrp.c`). The files `st_debug.c` and `e_breakable.c` are shared between WRP PSX and WRP PSP. Everything else from PSP is isolated into its own folder. I had to do some tricks on the YAML config to allow shared code. `ST_WRP_MERGE = st_debug e_breakable` in the `Makefile` is a bit annoying as MWCC complains about every single minute detail from the C source that has been already decompiled for the PSX US build. `EntityWarpSmallRocks` is matching on PSP but I couldn't extract the rodata without having a bunch of linker errors. This might be a Splat issue. I need to investigate further. `func_psp_09244760` is soooo interesting. The values from `0x11` to `0x17` matches the Entity IDs that are unique to the WRP overlay. This aligns to what we have in `typedef enum EntityIDs`. Overall I am very excited to the recent discoveries from the PSP build!
2024-05-25 18:56:06 +00:00
CollectHeart = 0x0923cbe0;
CollectGold = 0x0923cc80;
CollectSubweapon = 0x0923cd80;
CollectHeartVessel = 0x0923d018;
CollectLifeVessel = 0x0923d0d8;
DestroyCurrentEntity = 0x0923d130;
EntityPrizeDrop = 0x0923d158;
EntityExplosion = 0x0923df70;
BlinkItem = 0x0923e0d8;
EntityEquipItemDrop = 0x0923e270;
EntityRelicOrb = 0x0923eac8;
EntityHeartDrop = 0x0923fc00;
EntityMessageBox = 0x0923fdd0;
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 = 0x09240548;
PSP WRP data (#1249)
2024-06-03 17:08:38 +00:00
EntityUnkId14 = 0x09240690;
More entity cleanup: ET_Generic, renaming, and some Animset improvements (#1723) This is doing a few different things; I'm sort of finding issues and fixing them one by one. I've found more, but don't want this PR to get too bloated. 1) Removal of more uses of ET_Generic, and eliminating a few of its members 2) Renaming EntityUnk15 to EntityGreyPuff 3) Reworking Animset data. It's s16, not u32, so the data in d_2F324.c has been adjusted to match that.
2024-10-05 11:37:48 +00:00
EntityGreyPuff = 0x09240808;
Add ST/WRP from PSP (#1172) Extract ST/WRP out of #1119 . All the function symbols should have been cross-referenced. There as some PSX functions missing from PSP and some new functions from PSP that are not present on PSX (e.g. `st_init_wrp.c`). The files `st_debug.c` and `e_breakable.c` are shared between WRP PSX and WRP PSP. Everything else from PSP is isolated into its own folder. I had to do some tricks on the YAML config to allow shared code. `ST_WRP_MERGE = st_debug e_breakable` in the `Makefile` is a bit annoying as MWCC complains about every single minute detail from the C source that has been already decompiled for the PSX US build. `EntityWarpSmallRocks` is matching on PSP but I couldn't extract the rodata without having a bunch of linker errors. This might be a Splat issue. I need to investigate further. `func_psp_09244760` is soooo interesting. The values from `0x11` to `0x17` matches the Entity IDs that are unique to the WRP overlay. This aligns to what we have in `typedef enum EntityIDs`. Overall I am very excited to the recent discoveries from the PSP build!
2024-05-25 18:56:06 +00:00
EntityIntenseExplosion = 0x09240988;
More dedupes (#1548)
2024-08-20 04:36:45 +00:00
PlaySfxPositional = 0x09240af8;
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 = 0x09240c50;
EntityNumericDamage (#1295)
2024-06-12 02:26:18 +00:00
EntityDamageDisplay = 0x09242420;
Add ST/WRP from PSP (#1172) Extract ST/WRP out of #1119 . All the function symbols should have been cross-referenced. There as some PSX functions missing from PSP and some new functions from PSP that are not present on PSX (e.g. `st_init_wrp.c`). The files `st_debug.c` and `e_breakable.c` are shared between WRP PSX and WRP PSP. Everything else from PSP is isolated into its own folder. I had to do some tricks on the YAML config to allow shared code. `ST_WRP_MERGE = st_debug e_breakable` in the `Makefile` is a bit annoying as MWCC complains about every single minute detail from the C source that has been already decompiled for the PSX US build. `EntityWarpSmallRocks` is matching on PSP but I couldn't extract the rodata without having a bunch of linker errors. This might be a Splat issue. I need to investigate further. `func_psp_09244760` is soooo interesting. The values from `0x11` to `0x17` matches the Entity IDs that are unique to the WRP overlay. This aligns to what we have in `typedef enum EntityIDs`. Overall I am very excited to the recent discoveries from the PSP build!
2024-05-25 18:56:06 +00:00
BottomCornerText = 0x09242e28;
EntityRoomForeground = 0x09243420;
DestroyEntity = 0x09243538;
PreventEntityFromRespawning = 0x092435d0;
AnimateEntity = 0x09243658;
GetSideToPlayer = 0x092437c8;
MoveEntity = 0x09243850;
FallEntity = 0x092438a0;
AllocEntity = 0x092438d8;
UnkEntityFunc0 = 0x09243948;
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
GetAngleBetweenEntities = 0x092439f0;
GetNormalizedAngle = 0x09243a70;
Add ST/WRP from PSP (#1172) Extract ST/WRP out of #1119 . All the function symbols should have been cross-referenced. There as some PSX functions missing from PSP and some new functions from PSP that are not present on PSX (e.g. `st_init_wrp.c`). The files `st_debug.c` and `e_breakable.c` are shared between WRP PSX and WRP PSP. Everything else from PSP is isolated into its own folder. I had to do some tricks on the YAML config to allow shared code. `ST_WRP_MERGE = st_debug e_breakable` in the `Makefile` is a bit annoying as MWCC complains about every single minute detail from the C source that has been already decompiled for the PSX US build. `EntityWarpSmallRocks` is matching on PSP but I couldn't extract the rodata without having a bunch of linker errors. This might be a Splat issue. I need to investigate further. `func_psp_09244760` is soooo interesting. The values from `0x11` to `0x17` matches the Entity IDs that are unique to the WRP overlay. This aligns to what we have in `typedef enum EntityIDs`. Overall I am very excited to the recent discoveries from the PSP build!
2024-05-25 18:56:06 +00:00
SetStep = 0x09243b68;
InitializeEntity = 0x09243bb8;
EntityDummy = 0x09243d60;
Share more code and data between stage overlays (#1281) Given the fact that sharing compiled C objects is not exactly possible (code heavily copy&pasted maybe? this initiative is now abandoned 👉 https://github.com/Xeeynamo/sotn-decomp/commit/53a566f075a395e064f42db28737d5ef351f0ea1) I decided to keep pressing forward with shared headers. Thanks a lot to @hohle for making our life much easier by cross-referencing symbols. The file split on WRP seems to be the closest file split we might have compared to the original source code (still speculating here). I think it would be a good idea to start splitting other overlays too with the same approach. My idea is to have a file split like the following: ``` st/ cen/ e_particles.c e_misc.c st_common.c nz0/ e_particles.c e_misc.c st_common.c wrp/ e_particles.c e_misc.c st_common.c e_particles.h e_misc.h st_common.h ``` each of those C files will just be a one-line `#include "../the_shared_code.h"` as usual. Right now we create individual headers for single functions, sometimes for more than one function when we think grouping makes sense. But I think we can start merging some of those headers and consolidate the code. This can be done gradually. For example `src/st/e_particles.h` is still importing function headers under the hood. That is okay for now, but later on I wish to import those headers functions into their respective parent headers. Another important aspect to consider that will validate a correct file split is to start importing the data inside these new C files. Right now we have floating data such as `src/st/wrp_psp/wrp_data_EA00.c` or monstrosities such as `src/st/wrp/6FD0.c`. An example of a (possibly) correct migrated data is what this PR does with WRP PSP and NZ0 PSX, with data pointing in `src/st/*/e_particles.c`.
2024-06-08 19:34:58 +00:00
CheckFieldCollision = 0x09243d98;
Add ST/WRP from PSP (#1172) Extract ST/WRP out of #1119 . All the function symbols should have been cross-referenced. There as some PSX functions missing from PSP and some new functions from PSP that are not present on PSX (e.g. `st_init_wrp.c`). The files `st_debug.c` and `e_breakable.c` are shared between WRP PSX and WRP PSP. Everything else from PSP is isolated into its own folder. I had to do some tricks on the YAML config to allow shared code. `ST_WRP_MERGE = st_debug e_breakable` in the `Makefile` is a bit annoying as MWCC complains about every single minute detail from the C source that has been already decompiled for the PSX US build. `EntityWarpSmallRocks` is matching on PSP but I couldn't extract the rodata without having a bunch of linker errors. This might be a Splat issue. I need to investigate further. `func_psp_09244760` is soooo interesting. The values from `0x11` to `0x17` matches the Entity IDs that are unique to the WRP overlay. This aligns to what we have in `typedef enum EntityIDs`. Overall I am very excited to the recent discoveries from the PSP build!
2024-05-25 18:56:06 +00:00
ReplaceBreakableWithItemDrop = 0x09243f28;
PrimResetNext = 0x09244520;
UnkPolyFunc2 = 0x09244628;
PrimDecreaseBrightness = 0x09244690;
EntityBreakable = 0x09244838;
De-duplicate CEN (#1651) I went through all of CEN, cross-referencing it with WRP to make as many files match as possible. This involved pulling in data (which had been pulled in on WRP but not on CEN yet), renaming shared variables to not have placeholder names, adjusting file splits, and more. EntityBreakable seems to be very different here, so I did not do any deduplication on that one yet. I think we need to get a robust system for deduplicating across stages so we can share .h files even when the stages are different. Right now there's no way for an included .h file to know it's part of CEN (at least, that I know of).
2024-09-22 09:24:34 +00:00
EntityBackgroundBlock = 0x092449b8;
Merge RWRP with WRP (#1425) This will decompile all the functions but the new `EntityRWarpRoom` from the RWRP overlay. Note that as `e_misc.c` has a function with a different castle flag, I had to use a shared header. Everything else was identical. --------- Co-authored-by: bismurphy <tjmurphy@mit.edu>
2024-07-22 14:57:21 +00:00
EntityUnkId12 = 0x09244ac8;
Add ST/WRP from PSP (#1172) Extract ST/WRP out of #1119 . All the function symbols should have been cross-referenced. There as some PSX functions missing from PSP and some new functions from PSP that are not present on PSX (e.g. `st_init_wrp.c`). The files `st_debug.c` and `e_breakable.c` are shared between WRP PSX and WRP PSP. Everything else from PSP is isolated into its own folder. I had to do some tricks on the YAML config to allow shared code. `ST_WRP_MERGE = st_debug e_breakable` in the `Makefile` is a bit annoying as MWCC complains about every single minute detail from the C source that has been already decompiled for the PSX US build. `EntityWarpSmallRocks` is matching on PSP but I couldn't extract the rodata without having a bunch of linker errors. This might be a Splat issue. I need to investigate further. `func_psp_09244760` is soooo interesting. The values from `0x11` to `0x17` matches the Entity IDs that are unique to the WRP overlay. This aligns to what we have in `typedef enum EntityIDs`. Overall I am very excited to the recent discoveries from the PSP build!
2024-05-25 18:56:06 +00:00
EntityWarpRoom = 0x09244d28;
EntityWarpSmallRocks = 0x09245c50;
WRP PSP check-in more function (#1189) The highlight is that `src/st/wrp/st_update.c` is shared across the two overlays. `EntityMessageBox` and `EntityStageNamePopup` are vastly different.
2024-05-27 17:47:49 +00:00
g_eRedDoorUV = 0x09246080;
Wrp funcs 1 (#1188)
2024-05-27 09:06:22 +00:00
UNK_Invincibility0 = 0x09246098;
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 = 0x092460C8;
g_ESoulStealOrbSprt = 0x092460D8;
g_ESoulStealOrbAnim = 0x09246138;
Wrp data (#1285) Going to do a few files
2024-06-08 21:19:37 +00:00
D_80180DF4 = 0x092462F8;
e_collect.c adjustments (#1412) Changelog: * Import all the PSP WRP data that belong to `e_collect.c` * Remove the `ext.generic` use in favour of `ET_EquipItemDrop` * Document some fields from `ET_EquipItemDrop` * Discover the extra field `mariaSubWeapon` on PSP * `g_api.AddToInventory` signature changed to allow a better match on [EntityEquipItemDrop](https://decomp.me/scratch/PULKm) * Remove the fake array `D_8003BF9C` in favour of `g_CastleFlags` * The `O_TAG` struct is also valid on PSP * Decompile `EntityPrizeDrop` on PSP * Align `func_8018CAB0` to PSP * Align `EntityPrizeDrop` to PSP with a bunch of `#ifdef` * Align `EntityEquipItemDrop` to PSP using the WIP scratch [EntityEquipItemDrop](https://decomp.me/scratch/PULKm) * `DestroyCurrentEntity` is just an dummy item collector from `EntityPrizeDrop` * Duplicate functions in other overlays are not yet aligned as I am waiting to migrate them to use `e_collect` I noticed splat is not able to successfully recognise pointers if the data is too scattered. I had to merge the `data` in the YAML and allow it to be exported into a single file before starting to import it. The only missing function from `e_collect.c` is [EntityEquipItemDrop](https://decomp.me/scratch/PULKm). Data on PSX are slightly shuffled within the same C file. I believe the PSP build retains the original data order. Thanks to @sozud for the majority of the work on `EntityPrizeDrop` and `EntityEquipItemDrop` on PSP. And thanks to @bismurphy for solving the last piece of the puzzle to match `EntityPrizeDrop`.
2024-07-17 19:22:31 +00:00
g_SubweaponAnimPrizeDrop = 0x09246310;
Wrp data (#1285) Going to do a few files
2024-06-08 21:19:37 +00:00
g_MariaWeaponData1 = 0x09246388;
e_collect.c adjustments (#1412) Changelog: * Import all the PSP WRP data that belong to `e_collect.c` * Remove the `ext.generic` use in favour of `ET_EquipItemDrop` * Document some fields from `ET_EquipItemDrop` * Discover the extra field `mariaSubWeapon` on PSP * `g_api.AddToInventory` signature changed to allow a better match on [EntityEquipItemDrop](https://decomp.me/scratch/PULKm) * Remove the fake array `D_8003BF9C` in favour of `g_CastleFlags` * The `O_TAG` struct is also valid on PSP * Decompile `EntityPrizeDrop` on PSP * Align `func_8018CAB0` to PSP * Align `EntityPrizeDrop` to PSP with a bunch of `#ifdef` * Align `EntityEquipItemDrop` to PSP using the WIP scratch [EntityEquipItemDrop](https://decomp.me/scratch/PULKm) * `DestroyCurrentEntity` is just an dummy item collector from `EntityPrizeDrop` * Duplicate functions in other overlays are not yet aligned as I am waiting to migrate them to use `e_collect` I noticed splat is not able to successfully recognise pointers if the data is too scattered. I had to merge the `data` in the YAML and allow it to be exported into a single file before starting to import it. The only missing function from `e_collect.c` is [EntityEquipItemDrop](https://decomp.me/scratch/PULKm). Data on PSX are slightly shuffled within the same C file. I believe the PSP build retains the original data order. Thanks to @sozud for the majority of the work on `EntityPrizeDrop` and `EntityEquipItemDrop` on PSP. And thanks to @bismurphy for solving the last piece of the puzzle to match `EntityPrizeDrop`.
2024-07-17 19:22:31 +00:00
g_MariaSubweaponAnimPrizeDrop = 0x092463F8;
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 = 0x092464A8;
WRP PSP ReplaceBreakableWithItemDrop and more (#1184)
2024-05-26 21:29:34 +00:00
c_GoldPrizes = 0x092464D0;
e_collect.c adjustments (#1412) Changelog: * Import all the PSP WRP data that belong to `e_collect.c` * Remove the `ext.generic` use in favour of `ET_EquipItemDrop` * Document some fields from `ET_EquipItemDrop` * Discover the extra field `mariaSubWeapon` on PSP * `g_api.AddToInventory` signature changed to allow a better match on [EntityEquipItemDrop](https://decomp.me/scratch/PULKm) * Remove the fake array `D_8003BF9C` in favour of `g_CastleFlags` * The `O_TAG` struct is also valid on PSP * Decompile `EntityPrizeDrop` on PSP * Align `func_8018CAB0` to PSP * Align `EntityPrizeDrop` to PSP with a bunch of `#ifdef` * Align `EntityEquipItemDrop` to PSP using the WIP scratch [EntityEquipItemDrop](https://decomp.me/scratch/PULKm) * `DestroyCurrentEntity` is just an dummy item collector from `EntityPrizeDrop` * Duplicate functions in other overlays are not yet aligned as I am waiting to migrate them to use `e_collect` I noticed splat is not able to successfully recognise pointers if the data is too scattered. I had to merge the `data` in the YAML and allow it to be exported into a single file before starting to import it. The only missing function from `e_collect.c` is [EntityEquipItemDrop](https://decomp.me/scratch/PULKm). Data on PSX are slightly shuffled within the same C file. I believe the PSP build retains the original data order. Thanks to @sozud for the majority of the work on `EntityPrizeDrop` and `EntityEquipItemDrop` on PSP. And thanks to @bismurphy for solving the last piece of the puzzle to match `EntityPrizeDrop`.
2024-07-17 19:22:31 +00:00
D_80180EB8 = 0x092464F8;
CollectHeart (#1177)
2024-05-26 18:30:35 +00:00
c_HeartPrizes = 0x09246500;
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 = 0x09246508;
g_ExplosionAnimations = 0x092465C8;
Refactor Unkown Entity 15 (#1265) Co-authored-by: Jonathan Hohle <jon@ttkb.co>
2024-06-06 20:07:25 +00:00
unk15_rot = 0x09246690;
unk15_yVel = 0x092466A0;
PSP WRP data (#1249)
2024-06-03 17:08:38 +00:00
unk14_yVel = 0x092466B8;
unk14_startFrame = 0x092466D0;
unk14_lifetime = 0x092466D8;
EntityNumericDamage (#1295)
2024-06-12 02:26:18 +00:00
g_eDamageDisplayClut = 0x09246AA8;
De-duplicate CEN (#1651) I went through all of CEN, cross-referencing it with WRP to make as many files match as possible. This involved pulling in data (which had been pulled in on WRP but not on CEN yet), renaming shared variables to not have placeholder names, adjusting file splits, and more. EntityBreakable seems to be very different here, so I did not do any deduplication on that one yet. I think we need to get a robust system for deduplicating across stages so we can share .h files even when the stages are different. Right now there's no way for an included .h file to know it's part of CEN (at least, that I know of).
2024-09-22 09:24:34 +00:00
eRoomForegroundInit = 0x09246AE0;
wrp Overlay (#1286)
2024-06-08 21:29:45 +00:00
g_SpriteBanks = 0x09246C18;
g_TileLayers = 0x09246D18;
g_Cluts = 0x09246D80;
wrp data (#1289)
2024-06-08 23:09:29 +00:00
D_801801B8 = 0x09246D88;
D_801801CC = 0x09246DA0;
wrp Overlay (#1286)
2024-06-08 21:29:45 +00:00
g_EntityGfxs = 0x09246DC0;
WRP PSP check-in more function (#1189) The highlight is that `src/st/wrp/st_update.c` is shared across the two overlays. `EntityMessageBox` and `EntityStageNamePopup` are vastly different.
2024-05-27 17:47:49 +00:00
g_eRedDoorTiles = 0x09246E10;
Add ST/WRP from PSP (#1172) Extract ST/WRP out of #1119 . All the function symbols should have been cross-referenced. There as some PSX functions missing from PSP and some new functions from PSP that are not present on PSX (e.g. `st_init_wrp.c`). The files `st_debug.c` and `e_breakable.c` are shared between WRP PSX and WRP PSP. Everything else from PSP is isolated into its own folder. I had to do some tricks on the YAML config to allow shared code. `ST_WRP_MERGE = st_debug e_breakable` in the `Makefile` is a bit annoying as MWCC complains about every single minute detail from the C source that has been already decompiled for the PSX US build. `EntityWarpSmallRocks` is matching on PSP but I couldn't extract the rodata without having a bunch of linker errors. This might be a Splat issue. I need to investigate further. `func_psp_09244760` is soooo interesting. The values from `0x11` to `0x17` matches the Entity IDs that are unique to the WRP overlay. This aligns to what we have in `typedef enum EntityIDs`. Overall I am very excited to the recent discoveries from the PSP build!
2024-05-25 18:56:06 +00:00
g_eBreakableInit = 0x09246E90;
EntityEnemyBlood (#1208) Thanks to @dezgeg
2024-05-29 23:39:13 +00:00
g_InitializeData0 = 0x09246EA0;
Factor out EntityIntenseExplosion (#1218)
2024-05-30 22:53:17 +00:00
g_InitializeEntityData0 = 0x09246EB0;
PSP WRP merge warp.c and import bss section (#1303) Merging `wrp_psp/warp.c` into `wrp/warp.c`. I imported all the BSS data into `wrp_psp/bss.c`. I do not feel it is yet the right time to split the bss section into the individual files as I feel it might have a ripple effect to every other overlay. I confirm empty arrays on PSX are in data, but on PSP they are in bss. This is currently forcing me to do some `#ifdef` here and there. It should get solved once the bss is split into their respective original files. I feel very positive about the file split in WRP. So far it seems to be accurate. I really hope to spread this new pattern to other overlays too. It should make importing new stage overlays in the future much easier.
2024-06-11 22:14:50 +00:00
g_EInitGeneric = 0x09246EC0;
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 = 0x09246ED0;
More dedupes (#1556)
2024-08-21 03:57:18 +00:00
g_EntityUnkId12Init = 0x09246EE0;
Add ST/WRP from PSP (#1172) Extract ST/WRP out of #1119 . All the function symbols should have been cross-referenced. There as some PSX functions missing from PSP and some new functions from PSP that are not present on PSX (e.g. `st_init_wrp.c`). The files `st_debug.c` and `e_breakable.c` are shared between WRP PSX and WRP PSP. Everything else from PSP is isolated into its own folder. I had to do some tricks on the YAML config to allow shared code. `ST_WRP_MERGE = st_debug e_breakable` in the `Makefile` is a bit annoying as MWCC complains about every single minute detail from the C source that has been already decompiled for the PSX US build. `EntityWarpSmallRocks` is matching on PSP but I couldn't extract the rodata without having a bunch of linker errors. This might be a Splat issue. I need to investigate further. `func_psp_09244760` is soooo interesting. The values from `0x11` to `0x17` matches the Entity IDs that are unique to the WRP overlay. This aligns to what we have in `typedef enum EntityIDs`. Overall I am very excited to the recent discoveries from the PSP build!
2024-05-25 18:56:06 +00:00
g_eInitGeneric2 = 0x09246EF0;
EntityNumericDamage (#1295)
2024-06-12 02:26:18 +00:00
g_eDamageDisplayInit = 0x09246F00;
Merge RWRP with WRP (#1425) This will decompile all the functions but the new `EntityRWarpRoom` from the RWRP overlay. Note that as `e_misc.c` has a function with a different castle flag, I had to use a shared header. Everything else was identical. --------- Co-authored-by: bismurphy <tjmurphy@mit.edu>
2024-07-22 14:57:21 +00:00
g_EInitSmallRocks = 0x09246F10;
wrp Overlay (#1286)
2024-06-08 21:29:45 +00:00
g_Rooms = 0x09246F20;
Add ST/WRP from PSP (#1172) Extract ST/WRP out of #1119 . All the function symbols should have been cross-referenced. There as some PSX functions missing from PSP and some new functions from PSP that are not present on PSX (e.g. `st_init_wrp.c`). The files `st_debug.c` and `e_breakable.c` are shared between WRP PSX and WRP PSP. Everything else from PSP is isolated into its own folder. I had to do some tricks on the YAML config to allow shared code. `ST_WRP_MERGE = st_debug e_breakable` in the `Makefile` is a bit annoying as MWCC complains about every single minute detail from the C source that has been already decompiled for the PSX US build. `EntityWarpSmallRocks` is matching on PSP but I couldn't extract the rodata without having a bunch of linker errors. This might be a Splat issue. I need to investigate further. `func_psp_09244760` is soooo interesting. The values from `0x11` to `0x17` matches the Entity IDs that are unique to the WRP overlay. This aligns to what we have in `typedef enum EntityIDs`. Overall I am very excited to the recent discoveries from the PSP build!
2024-05-25 18:56:06 +00:00
g_eBreakableAnimations = 0x09246FB0;
g_eBreakableHitboxes = 0x09246FD0;
g_eBreakableanimSets = 0x09246FD8;
g_eBreakableDrawModes = 0x09246FE8;
wrp Overlay (#1286)
2024-06-08 21:29:45 +00:00
g_StageOverlay = 0x0924B960;
De-duplicate CEN (#1651) I went through all of CEN, cross-referencing it with WRP to make as many files match as possible. This involved pulling in data (which had been pulled in on WRP but not on CEN yet), renaming shared variables to not have placeholder names, adjusting file splits, and more. EntityBreakable seems to be very different here, so I did not do any deduplication on that one yet. I think we need to get a robust system for deduplicating across stages so we can share .h files even when the stages are different. Right now there's no way for an included .h file to know it's part of CEN (at least, that I know of).
2024-09-22 09:24:34 +00:00
g_eBackgroundBlockInit = 0x0924B9B8;
More dedupes (#1556)
2024-08-21 03:57:18 +00:00
g_EntityUnkId12Hitbox = 0x0924B9E0;
g_EntityUnkId12TilemapProps = 0x0924B9E8;
De-dupe EntityHeartDrop (#1628) Pulls this function into a .h file. Since each overlay uses a different offset into g_CastleFlags, we use `#define HEART_DROP_CASTLE_FLAG` before each `#include` statement in order to set these up correctly. Next we will hopefully be able to dedupe e_misc.c, but that will take a bit longer especially since PSP still needs EntityRelicOrb done, but I'm working on that one now.
2024-09-19 18:19:33 +00:00
g_HeartDropArray_wrp = 0x0924BA58;
Decompile WRP BSS (#1337) Move BSS definitions to code. This is the last of the ASM configured for WRP. --------- Co-authored-by: Jonathan Hohle <jon@ttkb.co>
2024-06-18 23:01:03 +00:00
WarpRoomCoords = 0x0924BA98;
PSP WRP EntityWarpRoom (#1296)
2024-06-11 04:19:56 +00:00
D_80186E30 = 0x0924BAB0;
D_80186E3C = 0x0924BAC0;
D_80186E4C = 0x0924BAD0;
D_80186E5C = 0x0924BAE0;
Fix g_LayoutObjHorizontal and g_LayoutObjVertical types (#1209) As discovered in [one of the recent PSP functions](https://decomp.me/scratch/thtl9), the types for `g_LayoutObjHorizontal` and `g_LayoutObjVertical` are not of `LayoutObject*` but `u16*`. This saves some awkward casts that caused Clang and modern GCC to fail to compile some recent code (specifically `((u16*)g_LayoutObjVertical) = ` being not valid C). This is a bit sad as it reverts part of the changes from #1166 that aimed to improve code clarity.
2024-05-30 17:34:42 +00:00
g_LayoutObjPosVertical = 0x0924BC00;
g_LayoutObjPosHorizontal = 0x0924BC08;
FallEntity (#1174) I get ``` mipsel-linux-gnu-ld: build/pspeu/src/st/wrp_psp/BF50.c.o: in function `FallEntity': (.text+0x0): undefined reference to `g_CurrentEntity' mipsel-linux-gnu-ld: (.text+0x4): undefined reference to `g_CurrentEntity' mipsel-linux-gnu-ld: (.text+0x1c): undefined reference to `g_CurrentEntity' mipsel-linux-gnu-ld: (.text+0x20): undefined reference to `g_CurrentEntity' ``` Not sure what the issue is
2024-05-26 12:26:51 +00:00
g_LayoutObjVertical = 0x0924BC10;
g_LayoutObjHorizontal = 0x0924BC18;
Add ST/WRP from PSP (#1172) Extract ST/WRP out of #1119 . All the function symbols should have been cross-referenced. There as some PSX functions missing from PSP and some new functions from PSP that are not present on PSX (e.g. `st_init_wrp.c`). The files `st_debug.c` and `e_breakable.c` are shared between WRP PSX and WRP PSP. Everything else from PSP is isolated into its own folder. I had to do some tricks on the YAML config to allow shared code. `ST_WRP_MERGE = st_debug e_breakable` in the `Makefile` is a bit annoying as MWCC complains about every single minute detail from the C source that has been already decompiled for the PSX US build. `EntityWarpSmallRocks` is matching on PSP but I couldn't extract the rodata without having a bunch of linker errors. This might be a Splat issue. I need to investigate further. `func_psp_09244760` is soooo interesting. The values from `0x11` to `0x17` matches the Entity IDs that are unique to the WRP overlay. This aligns to what we have in `typedef enum EntityIDs`. Overall I am very excited to the recent discoveries from the PSP build!
2024-05-25 18:56:06 +00:00
g_eBreakableExplosionTypes = 0x0924BCC8;
De-dupe EntityHeartDrop (#1628) Pulls this function into a .h file. Since each overlay uses a different offset into g_CastleFlags, we use `#define HEART_DROP_CASTLE_FLAG` before each `#include` statement in order to set these up correctly. Next we will hopefully be able to dedupe e_misc.c, but that will take a bit longer especially since PSP still needs EntityRelicOrb done, but I'm working on that one now.
2024-09-19 18:19:33 +00:00
g_HeartDropArray = 0x0924CCD0;
More dedupes (#1556)
2024-08-21 03:57:18 +00:00
g_EntityUnkId12Data = 0x0924CCD8;
Add ST/WRP from PSP (#1172) Extract ST/WRP out of #1119 . All the function symbols should have been cross-referenced. There as some PSX functions missing from PSP and some new functions from PSP that are not present on PSX (e.g. `st_init_wrp.c`). The files `st_debug.c` and `e_breakable.c` are shared between WRP PSX and WRP PSP. Everything else from PSP is isolated into its own folder. I had to do some tricks on the YAML config to allow shared code. `ST_WRP_MERGE = st_debug e_breakable` in the `Makefile` is a bit annoying as MWCC complains about every single minute detail from the C source that has been already decompiled for the PSX US build. `EntityWarpSmallRocks` is matching on PSP but I couldn't extract the rodata without having a bunch of linker errors. This might be a Splat issue. I need to investigate further. `func_psp_09244760` is soooo interesting. The values from `0x11` to `0x17` matches the Entity IDs that are unique to the WRP overlay. This aligns to what we have in `typedef enum EntityIDs`. Overall I am very excited to the recent discoveries from the PSP build!
2024-05-25 18:56:06 +00:00
D_80180648 = 0x0924CCE0;
Decompile WRP BSS (#1337) Move BSS definitions to code. This is the last of the ASM configured for WRP. --------- Co-authored-by: Jonathan Hohle <jon@ttkb.co>
2024-06-18 23:01:03 +00:00
WarpBackgroundBrightness = 0x0924CCE8;
WarpBackgroundPhase = 0x0924CCF0;
WarpBackgroundAmplitiude = 0x0924CCF8;
DestinationWarpRoom = 0x0924CD00;
Reference in New Issue Copy Permalink