Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-11-27 06:50:35 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
a860e7bc49
sotn-decomp/config/symbols.stmad.txt

70 lines
2.1 KiB
Plaintext
Raw Normal View History

Label shared entity across stages
2022-11-05 20:53:40 +00:00
g_pStTilesetDebug = 0x80180290;
Modernize headers (#1743) Extract some commits out of #1701 and avoid the part that will lead to a build failure (fixed in #1738). Now every header uses `OVL_EXPORT`.
2024-10-10 20:37:25 +00:00
MAD_gfxBanks = 0x801802A4;
WRP and CEN cohabitation (#1701) Experimental piece of work I feel confident enough to submit. A few things to take in consideration: * The new `pfn_entity_updates.h` header aims to use the PSP variant of `PfnEntityUpdates` and the two `g_pStObjLayout`, I just tweaked a bit the code from `stage.h` * Add overlay prefix to the PSX version of `PfnEntityUpdates` and the two `g_pStObjLayout` * Changed `wrp/create_entity` to `rwrp/create_entity` in RWRP because we need the `RWRP_` prefix to be issued * Remodernized the WRP header * I am still not sure what's wrong with `g_HeartDropArray` in `warp.c`. I am pretty sure it is a PSX bug. I opted for the PSP version There's a `// PfnEntityUpdates = OVL_EXPORT(EntityUpdates);`. If you uncomment and resolve the multiple definitions you will have the two overlays linked. I still need to figure out how to handle the `InitializeEntity` parameters in `e_init` without going mad with the `#ifdef`. Takeaways from the Xbox 360 build: * `EntityBreakable` is different in every overlay, so we can use the `OVL_EXPORT` in our decomp * Every other function seem to be de-duplciated. For those functions that are slightly different between overlays, the developers of the Xbox port opted for `if (g_StageId == XYZ)` Takeaways from the PSP build: * god bless the psp
2024-10-13 21:15:19 +00:00
MAD_pStObjLayoutHorizontal = 0x801802F4;
MAD_pStObjLayoutVertical = 0x801803C8;
Modernize headers (#1743) Extract some commits out of #1701 and avoid the part that will lead to a build failure (fixed in #1738). Now every header uses `OVL_EXPORT`.
2024-10-10 20:37:25 +00:00
MAD_EntityUpdates = 0x8018049C;
Refactor entity init arrays (#1781) Standardize names, plus give proper names to almost all the imported EInit arrays
2024-10-13 11:42:25 +00:00
g_EInitBreakable = 0x801804F0;
g_EInitUnkId13 = 0x8018052C;
Eliminate ET_Generic, and ext.stub (#1825) The quest is done! This eliminates the ET_Generic, and as a bonus, stub, from the Entity struct. This means no future code will be able to use these as defaults and will have to choose a particular extension, which is nice. As usual, while doing these cleanups I found various duplications to solve and file splits to normalize. Overall the code becomes more and more readable.
2024-10-25 22:56:41 +00:00
g_EInitUnkId12 = 0x80180538;
Refactor entity init arrays (#1781) Standardize names, plus give proper names to almost all the imported EInit arrays
2024-10-13 11:42:25 +00:00
g_EInitCommon = 0x80180544;
g_EInitDamageNum = 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;
Extract g_Rooms for all the overlays
2023-03-13 20:56:36 +00:00
g_Rooms = 0x80181130;
OVL_EXPORT RedDoorTiles (#1784)
2024-10-13 17:26:12 +00:00
MAD_RedDoorTiles = 0x80180594;
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;
Eliminate ET_Generic, and ext.stub (#1825) The quest is done! This eliminates the ET_Generic, and as a bonus, stub, from the Entity struct. This means no future code will be able to use these as defaults and will have to choose a particular extension, which is nice. As usual, while doing these cleanups I found various duplications to solve and file splits to normalize. Overall the code becomes more and more readable.
2024-10-25 22:56:41 +00:00
EntityUnkId12 = 0x8018E674;
Discover g_zEntityCenter field
2022-10-29 00:13:38 +00:00
EntityBreakable = 0x8018E830;
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;
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;
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;
Refactor entity init arrays (#1781) Standardize names, plus give proper names to almost all the imported EInit arrays
2024-10-13 11:42:25 +00:00
g_EInitParticle = 0x80180508;
g_EInitObtainable = 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
UnkPrimHelper = 0x80198FA0;
Name EntityExplosionVariants and cleanup around it (#1763) As named in Discord conversation. Gives a name to this function, renames its variables, renames its files, etc. PR looks kind of big but most of it is pretty minor find and replace.
2024-10-08 17:24:34 +00:00
EntityExplosionVariants = 0x80195A54;
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 = 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;
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;
Modernize headers (#1743) Extract some commits out of #1701 and avoid the part that will lead to a build failure (fixed in #1738). Now every header uses `OVL_EXPORT`.
2024-10-10 20:37:25 +00:00
MAD_rooms_layers = 0x801801F8;
Use `e_collect.h` for NP3, CEN, MAD, DRE, ST0 (#1502) Came across e_collect.c in NP3, and it wasn't using the e_collect.h, but now it is. Overall just a big deduplication.
2024-08-13 19:28:57 +00:00
g_collectXVelTable = 0x80180ED8;
g_collectYVelTable = 0x80180EDA;
Reference in New Issue Copy Permalink