mirror of
https://github.com/Xeeynamo/sotn-decomp.git
synced 2024-10-07 10:33:37 +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.
100 lines
3.1 KiB
Plaintext
100 lines
3.1 KiB
Plaintext
g_SpriteBanks = 0x80180040;
|
|
g_pStObjLayoutHorizontal = 0x80180220;
|
|
g_pStObjLayoutVertical = 0x801802F4;
|
|
PfnEntityUpdates = 0x801803C8;
|
|
g_eBreakableInit = 0x80180458;
|
|
g_InitializeData0 = 0x80180464;
|
|
g_InitializeEntityData0 = 0x80180470;
|
|
g_EInitGeneric = 0x80180488;
|
|
g_eInitGeneric2 = 0x801804AC;
|
|
g_eDamageDisplayInit = 0x801804B8;
|
|
g_eRedDoorTiles = 0x80180550;
|
|
g_eBreakableAnimations = 0x80180610;
|
|
g_eBreakableHitboxes = 0x80180630;
|
|
g_eBreakableExplosionTypes = 0x80180638;
|
|
g_eBreakableanimSets = 0x80180640;
|
|
g_eBreakableDrawModes = 0x80180650;
|
|
g_CloneShootOrder = 0x801807D4;
|
|
UNK_Invincibility0 = 0x8018097C;
|
|
g_testCollEnemyLookup = 0x801809A8;
|
|
g_testCollLuckCutoff = 0x80180CC8;
|
|
g_testColluCoords = 0x80180CCC;
|
|
g_testCollvCoords = 0x80180CD4;
|
|
g_testCollElementLookup = 0x80180CDC;
|
|
g_testColliFrames = 0x80180CF0;
|
|
g_testCollPrizeTable = 0x80180CFC;
|
|
g_testCollRandTable = 0x80180D3C;
|
|
g_eDamageDisplayClut = 0x80180D58;
|
|
g_eRedDoorUV = 0x80180D68;
|
|
g_goldCollectTexts = 0x801810F4;
|
|
c_GoldPrizes = 0x8018111C;
|
|
c_HeartPrizes = 0x801811AC;
|
|
g_bigRedFireballAnim = 0x801811D8;
|
|
g_eUnk14SpawnRots = 0x801812D4;
|
|
unk14_yVel = 0x8018130C;
|
|
unk14_startFrame = 0x80181324;
|
|
unk14_lifetime = 0x80181328;
|
|
g_olroxDroolCollOffsets = 0x80181330;
|
|
g_ESoulStealOrbAngles = 0x8018138C;
|
|
g_ESoulStealOrbSprt = 0x8018139C;
|
|
g_ESoulStealOrbAnim = 0x801813FC;
|
|
g_Rooms = 0x80181498;
|
|
g_UnkPrimHelperRot = 0x80191A5C;
|
|
EntityUnkId11 = 0x80191A64;
|
|
EntityBreakable = 0x80191D00;
|
|
EntityBackgroundClouds = 0x80191E34;
|
|
EntitySuccubus = 0x80192104;
|
|
EntitySuccubusPetal = 0x80193B3C;
|
|
EntitySuccubusWingOverlay = 0x80193D7C;
|
|
EntitySuccubusClone = 0x80193E18;
|
|
EntityPinkBallProjectile = 0x80194214;
|
|
EntitySuccubusWingSpike = 0x80194488;
|
|
EntitySuccubusWingSpikeTip = 0x801946C4;
|
|
EntitySuccubusCutscene = 0x801950F8;
|
|
EntityUnkId21 = 0x80196238;
|
|
EntityUnkId23 = 0x80196678;
|
|
EntityFadeToWhite1 = 0x8019697C;
|
|
EntityFadeToWhite2 = 0x80196CC8;
|
|
Update = 0x80196FC0;
|
|
UpdateStageEntities = 0x801972BC;
|
|
HitDetection = 0x801973C4;
|
|
EntityDamageDisplay = 0x801984DC;
|
|
InitRoomEntities = 0x801993DC;
|
|
UpdateRoomPosition = 0x80199554;
|
|
CreateEntityFromCurrentEntity = 0x80199608;
|
|
EntityRedDoor = 0x80199770;
|
|
DestroyEntity = 0x8019A3A8;
|
|
AnimateEntity = 0x8019A4D8;
|
|
MoveEntity = 0x8019A75C;
|
|
FallEntity = 0x8019A78C;
|
|
AllocEntity = 0x8019AC18;
|
|
SetStep = 0x8019AFE8;
|
|
InitializeEntity = 0x8019B0B8;
|
|
CollectGold = 0x8019BAB8;
|
|
CollectSubweapon = 0x8019BB94;
|
|
CollectHeartVessel = 0x8019BCAC;
|
|
CollectLifeVessel = 0x8019BD50;
|
|
DestroyCurrentEntity = 0x8019BDA0;
|
|
EntityPrizeDrop = 0x8019BDC8;
|
|
EntityExplosion = 0x8019C63C;
|
|
EntityEquipItemDrop = 0x8019C7DC;
|
|
EntityRelicOrb = 0x8019D074;
|
|
EntityHeartDrop = 0x8019DB44;
|
|
EntityMessageBox = 0x8019DC6C;
|
|
EntityUnkId13 = 0x8019E2B8;
|
|
EntityUnkId14 = 0x8019E5E0;
|
|
EntityUnkId15 = 0x8019E6D0;
|
|
EntityIntenseExplosion = 0x8019F070;
|
|
EntityStageNamePopup = 0x801A0734;
|
|
EntitySoulStealOrb = 0x801A13B8;
|
|
EntityEnemyBlood = 0x801A174C;
|
|
EntityRoomForeground = 0x801A1BFC;
|
|
EntityUnkId17 = 0x801A2E20;
|
|
Entity3DBackgroundHouse = 0x801A2F10;
|
|
g_LayoutObjHorizontal = 0x801A32C4;
|
|
g_LayoutObjVertical = 0x801A32C8;
|
|
g_LayoutObjPosHorizontal = 0x801A32CC;
|
|
g_LayoutObjPosVertical = 0x801A32D0;
|
|
g_Dialogue = 0x801A3ED8;
|
|
g_ItemIconSlots = 0x801A3F8C;
|