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 7 Packages Projects Releases Wiki Activity
ea0134f497
sotn-decomp/config/symbols.us.stnz0.txt

118 lines
3.7 KiB
Plaintext
Raw Normal View History

NZ0 extract room data
2023-03-31 07:42:12 +00:00
g_SpriteBanks = 0x8018002C;
g_Cluts = 0x80180160;
g_TileLayers = 0x80180394;
g_EntityGfxs = 0x80180888;
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_pStObjLayoutHorizontal = 0x801808EC;
g_pStObjLayoutVertical = 0x801809C0;
Dedupe CreateEntityFromLayout (#459)
2023-08-09 18:59:29 +00:00
PfnEntityUpdates = 0x80180A94;
Dedupe EntityEnemyBlood (#487)
2023-08-20 20:35:01 +00:00
g_InitializeData0 = 0x80180BD4;
De-duplicate EntityIntenseExplosion (#480)
2023-08-18 23:37:55 +00:00
g_InitializeEntityData0 = 0x80180BE0;
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
g_EInitGeneric = 0x80180BF8;
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 = 0x80180C1C;
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 = 0x80180C28;
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 = 0x80180D8C;
NZ0 Elevators (#468) These functions correspond to the two elevators in the Alchemy Lab, it's been some time since i happen to get a match in this overlay so i think this is good progress! Despite the appearance, these functions were really hard to tackle, there's some kind of variable reuse that i had to fake to get a match, i'm leaving the scratches in case somebody wants to mess with them and find a real match. https://decomp.me/scratch/bnY5N https://decomp.me/scratch/Hpxl5
2023-08-13 14:42:37 +00:00
g_CallElevator = 0x80180EEC;
NZ0 & NP3 - Slogra & Gaibon Boss decompiled and documented (#230) It's been a wild ride with this one, but i'm proud to present the first Boss decompilation of the project. ![image](https://github.com/Xeeynamo/sotn-decomp/assets/96613413/d0ed35a9-7032-42b8-b237-3cdc2a4d5db6) However, this contribution doesn't come without problems. I managed to match EntitySlogra 100% but the local assembler is skipping a NOP, so this makes it a NON_MATCHING until the compiler combo is fixed. As for EntityGaibon, i couldn't get a perfect match, some regalloc and instruction reordering persist in the assembler output, nevertheless the behaviour has been extensively tested in-game for days using two emulators simultaneously side by side to ensure it's equivalent. If you want to try the functions, you'd have to change splat.us.stnz0.yaml to exclude rodata extraction like this: - [0x305FC, .rodata, 33FCC] # EntitySlogra - [0x30618, .rodata, 33FCC] # EntityGaibon and remember to change the #ifndef to #ifdef to be able to compile them. Scratches: NZ0_EntitySlogra: https://decomp.me/scratch/vaRJR NZ0_EntityGaibon: https://decomp.me/scratch/QGtpG NP3_EntitySlogra: https://decomp.me/scratch/DGetH NP3_EntityGaibon: https://decomp.me/scratch/wUo18 Co-authored by the great @MottZilla, who actively provided his dynamic-analysis and code interpretation skills to achieve the perfect behaviour and documentation of the code.
2023-05-27 09:25:44 +00:00
g_BossFlag = 0x80181010;
NZ0 Elevators (#468) These functions correspond to the two elevators in the Alchemy Lab, it's been some time since i happen to get a match in this overlay so i think this is good progress! Despite the appearance, these functions were really hard to tackle, there's some kind of variable reuse that i had to fake to get a match, i'm leaving the scratches in case somebody wants to mess with them and find a real match. https://decomp.me/scratch/bnY5N https://decomp.me/scratch/Hpxl5
2023-08-13 14:42:37 +00:00
g_ElevatorTarget = 0x801813A4;
g_ElevatorTargetPos = 0x801813A8;
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 = 0x80181574;
De-duplicate TestCollisions (#1187) I think I did this right, but this is my first time de-duplicating a function, so please point out any mistakes :) ST0 not included because it has different logic internally - will work on decompiling that one next.
2024-05-27 09:04:31 +00:00
g_testCollEnemyLookup = 0x801815A0;
g_testCollLuckCutoff = 0x801818C0;
g_testColluCoords = 0x801818C4;
g_testCollvCoords = 0x801818CC;
g_testCollElementLookup = 0x801818D4;
g_testColliFrames = 0x801818E8;
g_testCollPrizeTable = 0x801818F4;
g_testCollRandTable = 0x80181934;
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_eDamageDisplayClut = 0x80181950;
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_eRedDoorUV = 0x80181960;
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 = 0x80181CEC;
Decompile func_8018F510 and similar across all overlays
2023-01-21 14:13:45 +00:00
c_GoldPrizes = 0x80181D14;
c_HeartPrizes = 0x80181DA4;
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 = 0x80181DD0;
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 = 0x80181ECC;
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 = 0x80181F04;
unk14_startFrame = 0x80181F1C;
unk14_lifetime = 0x80181F20;
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 = 0x80181F28;
Extract g_Rooms for all the overlays
2023-03-13 20:56:36 +00:00
g_Rooms = 0x8018272C;
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 = 0x801B0934;
Fix NZ0 splat config and symbols
2023-01-27 21:07:01 +00:00
EntityBreakable = 0x801B0EEC;
Format code
2023-05-06 01:16:56 +00:00
EntityRedEyeBust = 0x801B11C0;
EntityPurpleBrickScrollingBackground = 0x801B12E8;
EntityLeftSecretRoomWall = 0x801B14C4;
EntityBottomSecretRoomFloor = 0x801B1770;
EntityMoveableBox = 0x801B20CC;
EntityCannonLever = 0x801B23B4;
EntityCannon = 0x801B25C4;
EntityCannonShot = 0x801B2874;
EntityCannonWall = 0x801B2978;
NZ0 Elevators (#468) These functions correspond to the two elevators in the Alchemy Lab, it's been some time since i happen to get a match in this overlay so i think this is good progress! Despite the appearance, these functions were really hard to tackle, there's some kind of variable reuse that i had to fake to get a match, i'm leaving the scratches in case somebody wants to mess with them and find a real match. https://decomp.me/scratch/bnY5N https://decomp.me/scratch/Hpxl5
2023-08-13 14:42:37 +00:00
EntityElevator2 = 0x801B2D08;
Format code
2023-05-06 01:16:56 +00:00
EntityFloorSpikes = 0x801B3294;
EntityTableWithGlobe = 0x801B3534;
EntityCloseBossRoom = 0x801B3FCC;
EntityBossRoomBlock = 0x801B4518;
EntitySlogra = 0x801B4778;
NZ0 & NP3 - Slogra & Gaibon Boss decompiled and documented (#230) It's been a wild ride with this one, but i'm proud to present the first Boss decompilation of the project. ![image](https://github.com/Xeeynamo/sotn-decomp/assets/96613413/d0ed35a9-7032-42b8-b237-3cdc2a4d5db6) However, this contribution doesn't come without problems. I managed to match EntitySlogra 100% but the local assembler is skipping a NOP, so this makes it a NON_MATCHING until the compiler combo is fixed. As for EntityGaibon, i couldn't get a perfect match, some regalloc and instruction reordering persist in the assembler output, nevertheless the behaviour has been extensively tested in-game for days using two emulators simultaneously side by side to ensure it's equivalent. If you want to try the functions, you'd have to change splat.us.stnz0.yaml to exclude rodata extraction like this: - [0x305FC, .rodata, 33FCC] # EntitySlogra - [0x30618, .rodata, 33FCC] # EntityGaibon and remember to change the #ifndef to #ifdef to be able to compile them. Scratches: NZ0_EntitySlogra: https://decomp.me/scratch/vaRJR NZ0_EntityGaibon: https://decomp.me/scratch/QGtpG NP3_EntitySlogra: https://decomp.me/scratch/DGetH NP3_EntityGaibon: https://decomp.me/scratch/wUo18 Co-authored by the great @MottZilla, who actively provided his dynamic-analysis and code interpretation skills to achieve the perfect behaviour and documentation of the code.
2023-05-27 09:25:44 +00:00
EntitySlograSpear = 0x801B54A8;
Format code
2023-05-06 01:16:56 +00:00
EntitySlograSpearProjectile = 0x801B5654;
EntityGaibon = 0x801B5778;
EntitySmallGaibonProjectile = 0x801B6AAC;
EntityLargeGaibonProjectile = 0x801B6BBC;
NZ0 Elevators (#468) These functions correspond to the two elevators in the Alchemy Lab, it's been some time since i happen to get a match in this overlay so i think this is good progress! Despite the appearance, these functions were really hard to tackle, there's some kind of variable reuse that i had to fake to get a match, i'm leaving the scratches in case somebody wants to mess with them and find a real match. https://decomp.me/scratch/bnY5N https://decomp.me/scratch/Hpxl5
2023-08-13 14:42:37 +00:00
EntityElevator = 0x801B7034;
Format code
2023-05-06 01:16:56 +00:00
EntityMariaCutscene = 0x801B7D58;
Decompile func_8018F510 and similar across all overlays
2023-01-21 14:13:45 +00:00
Random = 0x801B94D4;
Fix NZ0 splat config and symbols
2023-01-27 21:07:01 +00:00
Update = 0x801B9504;
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 = 0x801B9800;
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 = 0x801B9908;
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 = 0x801BAA20;
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 = 0x801BB920;
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
UpdateRoomPosition = 0x801BBA98;
Add a few missing symbols across most overlays
2023-01-28 02:47:59 +00:00
CreateEntityFromCurrentEntity = 0x801BBB4C;
CreateEntityFromEntity = 0x801BBBC0;
Document entities
2023-01-05 19:35:01 +00:00
EntityRedDoor = 0x801BBCB4;
NZ0 (Alchemy Laboratory) Overlay extraction, functions migrated (#24)
2022-11-15 23:36:02 +00:00
DestroyEntity = 0x801BC8EC;
AnimateEntity = 0x801BCA1C;
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
GetSideToPlayer = 0x801BCC5C;
NZ0 (Alchemy Laboratory) Overlay extraction, functions migrated (#24)
2022-11-15 23:36:02 +00:00
MoveEntity = 0x801BCCA0;
AllocEntity = 0x801BD15C;
NZ0 & NP3 - Slogra & Gaibon Boss decompiled and documented (#230) It's been a wild ride with this one, but i'm proud to present the first Boss decompilation of the project. ![image](https://github.com/Xeeynamo/sotn-decomp/assets/96613413/d0ed35a9-7032-42b8-b237-3cdc2a4d5db6) However, this contribution doesn't come without problems. I managed to match EntitySlogra 100% but the local assembler is skipping a NOP, so this makes it a NON_MATCHING until the compiler combo is fixed. As for EntityGaibon, i couldn't get a perfect match, some regalloc and instruction reordering persist in the assembler output, nevertheless the behaviour has been extensively tested in-game for days using two emulators simultaneously side by side to ensure it's equivalent. If you want to try the functions, you'd have to change splat.us.stnz0.yaml to exclude rodata extraction like this: - [0x305FC, .rodata, 33FCC] # EntitySlogra - [0x30618, .rodata, 33FCC] # EntityGaibon and remember to change the #ifndef to #ifdef to be able to compile them. Scratches: NZ0_EntitySlogra: https://decomp.me/scratch/vaRJR NZ0_EntityGaibon: https://decomp.me/scratch/QGtpG NP3_EntitySlogra: https://decomp.me/scratch/DGetH NP3_EntityGaibon: https://decomp.me/scratch/wUo18 Co-authored by the great @MottZilla, who actively provided his dynamic-analysis and code interpretation skills to achieve the perfect behaviour and documentation of the code.
2023-05-27 09:25:44 +00:00
SetStep = 0x801BD52C;
SetSubStep = 0x801BD54C;
NZ0 (Alchemy Laboratory) Overlay extraction, functions migrated (#24)
2022-11-15 23:36:02 +00:00
InitializeEntity = 0x801BD5FC;
Fix NZ0 splat config and symbols
2023-01-27 21:07:01 +00:00
EntityDummy = 0x801BD6F8;
GetPlayerCollisionWith matching (#1196) With this one in, we only have two functions missing to have the first stage overlay with all the functions decompiled!
2024-05-27 18:21:44 +00:00
GetPlayerCollisionWith = 0x801BD9A0;
EntityPrizeDrop matching
2023-03-25 20:37:41 +00:00
EntityPrizeDrop = 0x801BE30C;
Decompile func_8018F510 and similar across all overlays
2023-01-21 14:13:45 +00:00
EntityExplosion = 0x801BEB80;
Remaining EntityEquipItemDrop duplicates (#165)
2023-03-26 15:25:05 +00:00
EntityEquipItemDrop = 0x801BED20;
Fix NZ0 splat config and symbols
2023-01-27 21:07:01 +00:00
EntityRelicOrb = 0x801BF5B8;
EntityHeartDrop = 0x801C0088;
Decompile EntityMessageBox (#536) ![image](https://github.com/Xeeynamo/sotn-decomp/assets/6128729/e967866c-1349-4264-b089-d5debc1e5d7a) Used to display a temporary message that displays a certain information to the player. It needs a new name before getting merged.
2023-09-01 09:08:20 +00:00
EntityMessageBox = 0x801C01B0;
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 = 0x801C0B24;
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 = 0x801C0C14;
Fix NZ0 splat config and symbols
2023-01-27 21:07:01 +00:00
EntityIntenseExplosion = 0x801C15B4;
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 = 0x801C2AA8;
Fix NZ0 splat config and symbols
2023-01-27 21:07:01 +00:00
EntityEnemyBlood = 0x801C2E3C;
NZ0 (Alchemy Laboratory) Overlay extraction, functions migrated (#24)
2022-11-15 23:36:02 +00:00
EntityRoomForeground = 0x801C32EC;
EntityBoneScimitar = 0x801C37E4;
EntityBoneScimitar + Docs (#213) ![image](https://user-images.githubusercontent.com/96613413/235360592-560968ec-7e4e-4f99-884c-7c370fd71e26.png) Co-Authored-by: @Xeeynamo Co-Authored-by: @pixel-stuck Co-Authored-by: @MottZilla
2023-04-30 20:04:00 +00:00
EntityBoneScimitarParts = 0x801C3E94;
Document some NZ0 entities (#101)
2023-02-18 22:01:39 +00:00
EntityAxeKnight = 0x801C45BC;
EntityAxeKnightThrowingAxe = 0x801C4D18;
EntityBloodSplatter = 0x801C4EAC;
Format code
2023-05-06 01:16:56 +00:00
EntityBloodyZombie = 0x801C5568;
Document some NZ0 entities (#101)
2023-02-18 22:01:39 +00:00
EntitySkeleton = 0x801C5FC4;
EntitySpittleBone = 0x801C672C;
Fix symbols
2023-08-31 16:31:55 +00:00
EntityRotateSpittlebone = 0x801C6B24;
Document some NZ0 entities (#101)
2023-02-18 22:01:39 +00:00
EntitySpittleBoneSpit = 0x801C6C6C;
NZ0 + NP3 Functions (#181) NZ0: EntityAxeKnight (I'm proud to present the first enemy decompiled in the project perhaps?) Here is the scratch in case somebody wants to tune it and provide changes: https://decomp.me/scratch/LKkYQ EntitySubWeaponContainer EntityBloodSplatter func_801B69E8 func_801C0D08 func_801C9E98 NP3: EntityBloodSplatter EntityZombie func_801B8CC0
2023-04-12 22:20:57 +00:00
EntitySubWeaponContainer = 0x801C7048;
Format code
2023-05-06 01:16:56 +00:00
EntityBloodSkeleton = 0x801C7958;
RWRP related deduping and refactoring (#975) Some deduping and renaming that might help later - Dedupe DestroyEntity - Dedupe ST EntityIsNearPlayer - Dedupe DestroyEntitiesFromIndex - Dedupe ST CollectHeart - Dedupe ST UnkEntityFunc0 - Decompile + rename rwrp EntityExplosionSpawn
2024-01-13 11:40:56 +00:00
EntityIsNearPlayer2 = 0x801C7CF0;
Document some NZ0 entities (#101)
2023-02-18 22:01:39 +00:00
EntityMagicallySealedDoor = 0x801C7D68;
Format code
2023-05-06 01:16:56 +00:00
EntityStageNamePopup = 0x801C8CAC;
Deduplicate functions and un-fake use of some Primitive structs (#991)
2024-01-18 19:04:04 +00:00
UnkPolyFunc2 = 0x801CA07C;
Format code
2023-05-06 01:16:56 +00:00
EntityLifeUpSpawn = 0x801CA160;
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 = 0x801CAA74;
g_LayoutObjVertical = 0x801CAA78;
g_LayoutObjPosHorizontal = 0x801CAA7C;
g_LayoutObjPosVertical = 0x801CAA80;
func_801A910 Duplicates + Custom SEL version (#527)
2023-08-30 20:20:02 +00:00
g_Dialogue = 0x801CB688;
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 = 0x801CB740;
Reference in New Issue Copy Permalink