mirror of
https://github.com/Xeeynamo/sotn-decomp.git
synced 2024-12-01 00:40:51 +00:00
a221c614be
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.
167 lines
5.3 KiB
Plaintext
167 lines
5.3 KiB
Plaintext
g_SpriteBanks = 0x80180040;
|
|
g_pStObjLayoutHorizontal = 0x8018077C;
|
|
g_pStObjLayoutVertical = 0x80180850;
|
|
PfnEntityUpdates = 0x80180924;
|
|
g_eBreakableInit = 0x80180AAC;
|
|
g_InitializeData0 = 0x80180AB8;
|
|
g_InitializeEntityData0 = 0x80180AC4;
|
|
g_EInitGeneric = 0x80180ADC;
|
|
g_eInitGeneric2 = 0x80180B00;
|
|
g_eDamageDisplayInit = 0x80180B0C;
|
|
g_eRedDoorTiles = 0x80180DA0;
|
|
g_eBreakableAnimations = 0x80180E50;
|
|
g_eBreakableHitboxes = 0x80180E70;
|
|
g_eBreakableExplosionTypes = 0x80180E78;
|
|
g_eBreakableanimSets = 0x80180E80;
|
|
g_eBreakableDrawModes = 0x80180E90;
|
|
g_TrapDoorFlag = 0x8018123C;
|
|
UNK_Invincibility0 = 0x80181CC0;
|
|
g_testCollEnemyLookup = 0x80181CEC;
|
|
g_testCollLuckCutoff = 0x8018200C;
|
|
g_testColluCoords = 0x80182010;
|
|
g_testCollvCoords = 0x80182018;
|
|
g_testCollElementLookup = 0x80182020;
|
|
g_testColliFrames = 0x80182034;
|
|
g_testCollPrizeTable = 0x80182040;
|
|
g_testCollRandTable = 0x80182080;
|
|
g_eDamageDisplayClut = 0x8018209C;
|
|
g_eRedDoorUV = 0x801820AC;
|
|
g_goldCollectTexts = 0x80182438;
|
|
c_GoldPrizes = 0x80182460;
|
|
c_HeartPrizes = 0x801824F0;
|
|
g_bigRedFireballAnim = 0x8018251C;
|
|
g_eUnk14SpawnRots = 0x80182618;
|
|
unk14_yVel = 0x80182650;
|
|
unk14_startFrame = 0x80182668;
|
|
unk14_lifetime = 0x8018266C;
|
|
g_olroxDroolCollOffsets = 0x80182674;
|
|
g_ESoulStealOrbAngles = 0x801826D0;
|
|
g_ESoulStealOrbSprt = 0x801826E0;
|
|
g_ESoulStealOrbAnim = 0x80182740;
|
|
g_Rooms = 0x80183CC4;
|
|
g_UnkPrimHelperRot = 0x801B77CC;
|
|
EntityCavernDoorVase = 0x801B77D4;
|
|
EntityUnkId12 = 0x801B78A8;
|
|
EntityBreakable = 0x801B7A64;
|
|
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;
|
|
EntityStairwayPiece = 0x801BAEF0;
|
|
EntityFallingRock = 0x801BB3BC;
|
|
EntityDeathSkySwirl = 0x801BBB8C;
|
|
EntityUnkId29 = 0x801BBDC0;
|
|
EntityUnkId2A = 0x801BBE70;
|
|
EntitySwitch = 0x801BBF38;
|
|
EntityHeartRoomGoldDoor = 0x801BC05C;
|
|
EntityUnkId49 = 0x801BC3FC;
|
|
EntityPushAlucard = 0x801BC4EC;
|
|
EntityCastleDoorTransition = 0x801BC780;
|
|
EntityForegroundTree = 0x801BC93C;
|
|
EntityUnkId50 = 0x801BCC4C;
|
|
EntityBackgroundPineTrees = 0x801BCE08;
|
|
EntityUnkId52 = 0x801BD564;
|
|
EntityCastleBridge = 0x801BD71C;
|
|
EntityBackgroundTrees = 0x801BDEB0;
|
|
EntityBackgroundCastleWall = 0x801BE080;
|
|
EntityFlyingOwlAndLeaves = 0x801BE134;
|
|
EntityFallingLeaf = 0x801BE444;
|
|
EntityRoomTransition1 = 0x801BEEB0;
|
|
EntityRoomTransition2 = 0x801BFF00;
|
|
EntityDeathStolenItem = 0x801C033C;
|
|
EntityDeath = 0x801C083C;
|
|
EntityUnkId5B = 0x801C11A4;
|
|
EntityUnkId5E = 0x801C12E8;
|
|
EntityWargExplosionPuffOpaque = 0x801C14B8;
|
|
Random = 0x801C184C;
|
|
Update = 0x801C187C;
|
|
UpdateStageEntities = 0x801C1B78;
|
|
HitDetection = 0x801C1C80;
|
|
EntityDamageDisplay = 0x801C2D98;
|
|
InitRoomEntities = 0x801C3C98;
|
|
UpdateRoomPosition = 0x801C3E10;
|
|
CreateEntityFromCurrentEntity = 0x801C3EC4;
|
|
CreateEntityFromEntity = 0x801C3F38;
|
|
EntityRedDoor = 0x801C402C;
|
|
DestroyEntity = 0x801C4C64;
|
|
AnimateEntity = 0x801C4D94;
|
|
GetDistanceToPlayerX = 0x801C4F64;
|
|
GetDistanceToPlayerY = 0x801C4FA0;
|
|
GetSideToPlayer = 0x801C4FD4;
|
|
MoveEntity = 0x801C5018;
|
|
FallEntity = 0x801C5048;
|
|
AllocEntity = 0x801C54D4;
|
|
SetStep = 0x801C58A4;
|
|
InitializeEntity = 0x801C5974;
|
|
EntityDummy = 0x801C5A70;
|
|
EntityPrizeDrop = 0x801C6684;
|
|
EntityExplosion = 0x801C6EF8;
|
|
EntityEquipItemDrop = 0x801C7098;
|
|
EntityRelicOrb = 0x801C7930;
|
|
EntityHeartDrop = 0x801C8400;
|
|
EntityMessageBox = 0x801C8528;
|
|
EntityUnkId13 = 0x801C8B74;
|
|
EntityUnkId14Spawner = 0x801C8C84;
|
|
EntityUnkId14 = 0x801C8E9C;
|
|
EntityUnkId15 = 0x801C8F8C;
|
|
EntityIntenseExplosion = 0x801C992C;
|
|
EntityStageNamePopup = 0x801CAFF0;
|
|
EntitySoulStealOrb = 0x801CBC74;
|
|
EntityEnemyBlood = 0x801CC008;
|
|
EntityRoomForeground = 0x801CC4B8;
|
|
EntityStrongWarg = 0x801CC974;
|
|
EntityUnkId30 = 0x801CDD80;
|
|
EntityUnkId31 = 0x801CDF10;
|
|
EntityExplosion3 = 0x801CE2F4;
|
|
EntityStrongWargWaveAttack = 0x801CE98C;
|
|
EntityUnkId2F = 0x801CED60;
|
|
EntityStrongWargDeathBeams = 0x801CEF88;
|
|
EntityWarg = 0x801CF740;
|
|
EntityUnkId4B = 0x801D04A4;
|
|
EntityWargExplosionPuffTransparent = 0x801D0624;
|
|
EntityAlucardWaterEffect = 0x801D0B34;
|
|
EntitySplashWater = 0x801D16B4;
|
|
EntitySurfacingWater = 0x801D1FC0;
|
|
EntitySideWaterSplash = 0x801D24AC;
|
|
EntitySmallWaterDrop = 0x801D2840;
|
|
EntityWaterDrop = 0x801D2A9C;
|
|
EntityMerman3 = 0x801D2E4C;
|
|
EntityExplosion2 = 0x801D3F38;
|
|
EntityMediumWaterSplash = 0x801D4168;
|
|
EntityMermanWaterSplash = 0x801D423C;
|
|
EntityFallingObject2 = 0x801D4668;
|
|
EntityUnkId3D = 0x801D4700;
|
|
EntityLargeFallingObject = 0x801D48F8;
|
|
EntityMermanSpawner = 0x801D49C4;
|
|
EntityMerman = 0x801D4B20;
|
|
EntityMermanFireball = 0x801D56D8;
|
|
EntityFallingObject = 0x801D583C;
|
|
EntityMermanExplosion = 0x801D58D4;
|
|
EntityBoneScimitar = 0x801D5AAC;
|
|
EntityBoneScimitarParts = 0x801D615C;
|
|
EntityBat = 0x801D6264;
|
|
EntityZombie = 0x801D64B0;
|
|
EntityZombieSpawner = 0x801D6710;
|
|
UnkPrimHelper = 0x801D6880;
|
|
UnkPolyFunc2 = 0x801D6FCC;
|
|
g_LayoutObjHorizontal = 0x801D7110;
|
|
g_LayoutObjVertical = 0x801D7114;
|
|
g_LayoutObjPosHorizontal = 0x801D7118;
|
|
g_LayoutObjPosVertical = 0x801D711C;
|
|
g_Dialogue = 0x801D7D24;
|
|
g_ItemIconSlots = 0x801D7DD8;
|