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
9b39bb764a
sotn-decomp/config/symbols.us.stno3.txt

156 lines
4.9 KiB
Plaintext
Raw Normal View History

Clearer GameApi symbols (thanks @KernelEquinox)
2023-01-23 07:22:35 +00:00
g_SpriteBanks = 0x80180040;
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 = 0x8018077C;
g_pStObjLayoutVertical = 0x80180850;
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 = 0x80180924;
Document EntityBreakable
2022-10-29 00:33:04 +00:00
g_eBreakableInit = 0x80180AAC;
Dedupe EntityEnemyBlood (#487)
2023-08-20 20:35:01 +00:00
g_InitializeData0 = 0x80180AB8;
De-duplicate EntityIntenseExplosion (#480)
2023-08-18 23:37:55 +00:00
g_InitializeEntityData0 = 0x80180AC4;
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 = 0x80180ADC;
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 = 0x80180B00;
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 = 0x80180B0C;
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 = 0x80180DA0;
Document EntityBreakable
2022-10-29 00:33:04 +00:00
g_eBreakableAnimations = 0x80180E50;
g_eBreakableHitboxes = 0x80180E70;
g_eBreakableExplosionTypes = 0x80180E78;
Discover structs AnimationFrame and FrameProperty
2023-02-12 01:00:23 +00:00
g_eBreakableanimSets = 0x80180E80;
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 = 0x80180E90;
Format code
2023-05-06 01:16:56 +00:00
g_TrapDoorFlag = 0x8018123C;
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 = 0x80181CC0;
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 = 0x80181CEC;
g_testCollLuckCutoff = 0x8018200C;
g_testColluCoords = 0x80182010;
g_testCollvCoords = 0x80182018;
g_testCollElementLookup = 0x80182020;
g_testColliFrames = 0x80182034;
g_testCollPrizeTable = 0x80182040;
g_testCollRandTable = 0x80182080;
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 = 0x8018209C;
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 = 0x801820AC;
Decompile func_801BBE70, add duplicates (#71)
2023-01-24 22:56:36 +00:00
c_GoldPrizes = 0x80182460;
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
c_HeartPrizes = 0x801824F0;
Extract g_Rooms for all the overlays
2023-03-13 20:56:36 +00:00
g_Rooms = 0x80183CC4;
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 = 0x801B77CC;
Format code
2023-05-06 01:16:56 +00:00
EntityCavernDoorVase = 0x801B77D4;
EntityUnkId12 = 0x801B78A8;
Discover g_zEntityCenter field
2022-10-29 00:13:38 +00:00
EntityBreakable = 0x801B7A64;
Format code
2023-05-06 01:16:56 +00:00
EntityUnkId16 = 0x801B7B98;
EntityBackgroundLightning = 0x801B7C4C;
EntityShuttingWindow = 0x801B8254;
EntityCastleDoor = 0x801B8564;
EntityBackgroundBushes = 0x801B8A74;
EntityUnkId1C = 0x801B8ED0;
EntityTransparentWater = 0x801B9198;
EntityCavernDoorLever = 0x801B9650;
EntityCavernDoorPlatform = 0x801B97D0;
EntityCavernDoor = 0x801B989C;
EntityClickSwitch = 0x801B9CE8;
EntityPathBlockSmallWeight = 0x801B9E10;
EntityPathBlockTallWeight = 0x801BA0A0;
EntityTrapDoor = 0x801BA348;
EntityMermanRockLeftSide = 0x801BA4C0;
EntityMermanRockRightSide = 0x801BA868;
EntityUnkId26 = 0x801BABE8;
EntityFallingRock2 = 0x801BAD6C;
NO3 & NP3 EntityStairwayPiece + merman rock Docs (#511) ![image](https://github.com/Xeeynamo/sotn-decomp/assets/96613413/8cd5262d-cdbc-40c0-bb46-3ace3f0ba316) I've been trying to match this one since two weeks now, i very happy to finally being able to decompile it. https://decomp.me/scratch/AZMMV I'm including a few duplicates and doc corrections since they are in the same file for consistency.
2023-08-26 02:00:12 +00:00
EntityStairwayPiece = 0x801BAEF0;
Format code
2023-05-06 01:16:56 +00:00
EntityFallingRock = 0x801BB3BC;
EntityDeathSkySwirl = 0x801BBB8C;
EntityUnkId29 = 0x801BBDC0;
EntityUnkId2A = 0x801BBE70;
EntitySwitch = 0x801BBF38;
EntityHeartRoomGoldDoor = 0x801BC05C;
EntityUnkId49 = 0x801BC3FC;
EntityPushAlucard = 0x801BC4EC;
NO3 EntityCastleDoorTransition (#518) This is the Entity that pushes the player through the castle door at the entrance. I decompiled this a long time ago, but it wasn't matching because of an instruction reorder, oddly, it was matching in PSYQ 4.0 for some weird reason. Today i discovered why, the problem was the function prototype. https://decomp.me/scratch/a1jYQ
2023-08-27 21:23:07 +00:00
EntityCastleDoorTransition = 0x801BC780;
Format code
2023-05-06 01:16:56 +00:00
EntityForegroundTree = 0x801BC93C;
EntityUnkId50 = 0x801BCC4C;
EntityBackgroundPineTrees = 0x801BCE08;
EntityUnkId52 = 0x801BD564;
NO3 EntityCastleDoorTransition (#518) This is the Entity that pushes the player through the castle door at the entrance. I decompiled this a long time ago, but it wasn't matching because of an instruction reorder, oddly, it was matching in PSYQ 4.0 for some weird reason. Today i discovered why, the problem was the function prototype. https://decomp.me/scratch/a1jYQ
2023-08-27 21:23:07 +00:00
EntityCastleBridge = 0x801BD71C;
NO3 EntityBackgroundTrees (#516) https://decomp.me/scratch/NMbNS
2023-08-27 18:24:14 +00:00
EntityBackgroundTrees = 0x801BDEB0;
Format code
2023-05-06 01:16:56 +00:00
EntityBackgroundCastleWall = 0x801BE080;
EntityFlyingOwlAndLeaves = 0x801BE134;
EntityFallingLeaf = 0x801BE444;
EntityRoomTransition1 = 0x801BEEB0;
EntityRoomTransition2 = 0x801BFF00;
EntityDeathStolenItem = 0x801C033C;
NO3 EntityDeath (#523) https://decomp.me/scratch/I4ap0 ![image](https://github.com/Xeeynamo/sotn-decomp/assets/96613413/e0efb102-514d-48c2-9f71-9d3c0b2c695c) Ahhh, Alucard. What is your business here?
2023-08-28 21:41:32 +00:00
EntityDeath = 0x801C083C;
Format code
2023-05-06 01:16:56 +00:00
EntityUnkId5B = 0x801C11A4;
EntityUnkId5E = 0x801C12E8;
[NO3] Decompile func_801D0624, func_801D4168, document entities (#77) I documented some entities by changing the Zombie function pointer into the entity table to something else and seeing what spawned in the first hallway. Some of the unknown entities may be due to being spawned with the wrong subId.
2023-01-27 20:21:38 +00:00
EntityWargExplosionPuffOpaque = 0x801C14B8;
Decompile a few obj related functions in st/no3
2022-08-23 22:43:05 +00:00
Random = 0x801C184C;
Clearer GameApi symbols (thanks @KernelEquinox)
2023-01-23 07:22:35 +00:00
Update = 0x801C187C;
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 = 0x801C1B78;
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 = 0x801C1C80;
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 = 0x801C2D98;
Clearer GameApi symbols (thanks @KernelEquinox)
2023-01-23 07:22:35 +00:00
InitRoomEntities = 0x801C3C98;
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 = 0x801C3E10;
Add a few missing symbols across most overlays
2023-01-28 02:47:59 +00:00
CreateEntityFromCurrentEntity = 0x801C3EC4;
CreateEntityFromEntity = 0x801C3F38;
Discover EntityRedDoor
2022-11-05 21:00:42 +00:00
EntityRedDoor = 0x801C402C;
Label shared entity across stages
2022-11-05 20:53:40 +00:00
DestroyEntity = 0x801C4C64;
Reverse engineer how the entity Candle works
2022-02-06 16:35:17 +00:00
AnimateEntity = 0x801C4D94;
Rename GetDistanceToPlayer and GetSideToPlayer (#350) As we decided on Discord (https://discord.com/channels/1079389589950705684/1087866009983139870/1125555095778644039) I mass-renamed `GetPlayerDistance` into `GetDistanceToPlayer` and `GetPlayerSide` into `GetSideToPlayer`. I also took the opportunity to tweak the comments and add the symbols to the missing overlays.
2023-07-12 07:18:59 +00:00
GetDistanceToPlayerX = 0x801C4F64;
GetDistanceToPlayerY = 0x801C4FA0;
GetSideToPlayer = 0x801C4FD4;
Discover MoveEntity
2022-03-03 23:38:38 +00:00
MoveEntity = 0x801C5018;
FallEntity = 0x801C5048;
Reverse engineer how the entity Candle works
2022-02-06 16:35:17 +00:00
AllocEntity = 0x801C54D4;
CollectSubweapon + duplicates (#326) This function was already decompiled for ST0, it was reviewed and merged in a previous PR, The one for the MAD overlay is a duplicate of the same func. As for the rest of the overlays, the function calls SetStep instead of just modifying the Current Entity step and step_s directly, so with that little change the "normal" version of the function is now decompiled.
2023-07-07 16:25:55 +00:00
SetStep = 0x801C58A4;
Reverse engineer how the entity Candle works
2022-02-06 16:35:17 +00:00
InitializeEntity = 0x801C5974;
Label shared entity across stages
2022-11-05 20:53:40 +00:00
EntityDummy = 0x801C5A70;
EntityPrizeDrop matching
2023-03-25 20:37:41 +00:00
EntityPrizeDrop = 0x801C6684;
Label shared entity across stages
2022-11-05 20:53:40 +00:00
EntityExplosion = 0x801C6EF8;
Remaining EntityEquipItemDrop duplicates (#165)
2023-03-26 15:25:05 +00:00
EntityEquipItemDrop = 0x801C7098;
Document entities
2023-01-05 19:35:01 +00:00
EntityRelicOrb = 0x801C7930;
EntityHeartDrop = 0x801C8400;
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 = 0x801C8528;
Format code
2023-05-06 01:16:56 +00:00
EntityUnkId13 = 0x801C8B74;
EntityUnkId14 = 0x801C8E9C;
EntityUnkId15 = 0x801C8F8C;
Discover EntityIntenseExplosion
2022-11-05 21:09:21 +00:00
EntityIntenseExplosion = 0x801C992C;
Label shared entity across stages
2022-11-05 20:53:40 +00:00
EntityStageNamePopup = 0x801CAFF0;
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 = 0x801CBC74;
Discover EntityEnemyBlood
2022-11-05 21:04:00 +00:00
EntityEnemyBlood = 0x801CC008;
Label shared entity across stages
2022-11-05 20:53:40 +00:00
EntityRoomForeground = 0x801CC4B8;
Format code
2023-05-06 01:16:56 +00:00
EntityStrongWarg = 0x801CC974;
EntityUnkId30 = 0x801CDD80;
EntityUnkId31 = 0x801CDF10;
EntityExplosion3 = 0x801CE2F4;
EntityStrongWargWaveAttack = 0x801CE98C;
EntityUnkId2F = 0x801CED60;
EntityStrongWargDeathBeams = 0x801CEF88;
Discover how the object AI is loaded
2022-02-05 21:07:33 +00:00
EntityWarg = 0x801CF740;
Format code
2023-05-06 01:16:56 +00:00
EntityUnkId4B = 0x801D04A4;
[NO3] Decompile func_801D0624, func_801D4168, document entities (#77) I documented some entities by changing the Zombie function pointer into the entity table to something else and seeing what spawned in the first hallway. Some of the unknown entities may be due to being spawned with the wrong subId.
2023-01-27 20:21:38 +00:00
EntityWargExplosionPuffTransparent = 0x801D0624;
Format code
2023-05-06 01:16:56 +00:00
EntityAlucardWaterEffect = 0x801D0B34;
Update ET_WaterEffects extension + function names (#488)
2023-08-21 01:38:18 +00:00
EntitySplashWater = 0x801D16B4;
EntitySurfacingWater = 0x801D1FC0;
EntitySideWaterSplash = 0x801D24AC;
EntitySmallWaterDrop = 0x801D2840;
EntityWaterDrop = 0x801D2A9C;
Format code
2023-05-06 01:16:56 +00:00
EntityMerman3 = 0x801D2E4C;
EntityExplosion2 = 0x801D3F38;
EntityMediumWaterSplash = 0x801D4168;
NO3 & NP3 EntityMermanWaterSplash (#497) Suggestions for the Unkstruct are appreciated. https://decomp.me/scratch/nsw53
2023-08-22 22:05:16 +00:00
EntityMermanWaterSplash = 0x801D423C;
Format code
2023-05-06 01:16:56 +00:00
EntityFallingObject2 = 0x801D4668;
EntityUnkId3D = 0x801D4700;
EntityLargeFallingObject = 0x801D48F8;
NP3 - Mermans (#239) Enemy: Merman (2 variants) ![image](https://github.com/Xeeynamo/sotn-decomp/assets/96613413/9e1650a6-bb8d-4c4d-889f-7479cff60724) ![image](https://github.com/Xeeynamo/sotn-decomp/assets/96613413/2bbc77c2-dcce-4fef-a546-33f9e76745a8) Scratches: https://decomp.me/scratch/8wa56 https://decomp.me/scratch/pjVr0 Co-authored-by @MottZilla
2023-06-13 12:44:32 +00:00
EntityMermanSpawner = 0x801D49C4;
Discover how the object AI is loaded
2022-02-05 21:07:33 +00:00
EntityMerman = 0x801D4B20;
Format code
2023-05-06 01:16:56 +00:00
EntityMermanFireball = 0x801D56D8;
EntityFallingObject = 0x801D583C;
EntityMermanExplosion = 0x801D58D4;
Label shared entity across stages
2022-11-05 20:53:40 +00:00
EntityBoneScimitar = 0x801D5AAC;
Format code
2023-05-06 01:16:56 +00:00
EntityBoneScimitarParts = 0x801D615C;
Discover how the object AI is loaded
2022-02-05 21:07:33 +00:00
EntityBat = 0x801D6264;
EntityZombie = 0x801D64B0;
Document zombie spawner entity (#231) Renamed `EntityUnkId4D` and `EntityZombieExplosion` to `EntityZombieSpawner`. Describes how the zombie spawner behaves.
2023-05-22 20:43:36 +00:00
EntityZombieSpawner = 0x801D6710;
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 = 0x801D6880;
Deduplicate functions and un-fake use of some Primitive structs (#991)
2024-01-18 19:04:04 +00:00
UnkPolyFunc2 = 0x801D6FCC;
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 = 0x801D7110;
g_LayoutObjVertical = 0x801D7114;
g_LayoutObjPosHorizontal = 0x801D7118;
g_LayoutObjPosVertical = 0x801D711C;
Fix master build
2023-09-07 13:09:31 +00:00
g_Dialogue = 0x801D7D24;
g_ItemIconSlots = 0x801D7DD8;
Reference in New Issue Copy Permalink