Game-Decompilation/mzm
1
0
Fork 0
mirror of https://github.com/YohannDR/mzm.git synced 2024-12-04 03:02:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Match few samus functions and ParasiteMultipleJumpingDown

Browse Source
This commit is contained in:
y.demaisonregne 2023-03-25 00:28:58 +01:00
parent 7c73239a02
commit f97ae15f17
3 changed files with 80 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/types.h
View File

@ -33,7 +33,7 @@ typedef volatile signed int vi32;
#define BLOCK_SIZE 0x40
#define HALF_BLOCK_SIZE (BLOCK_SIZE / 2)
#define QUARTER_BLOCK_SIZE (BLOCK_SIZE / 4)
#define BLOCK_POSITION_FLAG (~BLOCK_SIZE + 1)
#define BLOCK_POSITION_FLAG ((u16)~BLOCK_SIZE + 1)
#define SUB_PIXEL_POSITION_FLAG (BLOCK_SIZE - 1)
struct RawCoordsX {

71
src/samus.c
View File

@ -392,14 +392,85 @@ u8 SamusCheckWalkingSidesCollision(struct SamusData* pData, struct SamusPhysics*
}
/**
* @brief 5ad8 | b4 | To document
*
* @param pData Samus data pointer
* @param pPhysics Samus physics pointer
* @return u8 New pose
*/
u8 unk_5AD8(struct SamusData* pData, struct SamusPhysics* pPhysics)
{
u16 yPosition;
u16 xPosition;
u16 slope;
if ((pData->xPosition & BLOCK_POSITION_FLAG) == (gPreviousXPosition & BLOCK_POSITION_FLAG) &&
pData->currentSlope == 0 && pData->standingStatus == STANDING_GROUND)
{
if (SamusSlopeRelated(pData->xPosition, pData->yPosition + 1,
&xPosition, &yPosition, &slope) == CLIPDATA_TYPE_AIR && slope == 0)
{
if (pPhysics->horizontalMovingDirection == HDMOVING_RIGHT)
{
if ((pData->xPosition & SUB_PIXEL_POSITION_FLAG) > 0x1D && (gPreviousXPosition & SUB_PIXEL_POSITION_FLAG) < 0x1F)
{
pData->xPosition = (pData->xPosition & BLOCK_POSITION_FLAG) + 0x1E;
return SPOSE_UPDATE_JUMP_VELOCITY_REQUEST;
}
}
else if (pPhysics->horizontalMovingDirection == HDMOVING_LEFT)
{
if ((pData->xPosition & SUB_PIXEL_POSITION_FLAG) < 0x22 && (gPreviousXPosition & SUB_PIXEL_POSITION_FLAG) > 0x20)
{
pData->xPosition = (pData->xPosition & BLOCK_POSITION_FLAG) + 0x21;
return SPOSE_UPDATE_JUMP_VELOCITY_REQUEST;
}
}
}
}
return SPOSE_NONE;
}
/**
* @brief 5b8c | c0 | Checks for block collision when not moving on the ground
*
* @param pData Samus data pointer
* @param pPhysics Samus physics pointer
* @return u8 New pose
*/
u8 SamusCheckStandingOnGroundCollision(struct SamusData* pData, struct SamusPhysics* pPhysics)
{
u8 above;
u16 yPosition;
u16 xPosition;
u16 slope;
above = SamusCheckCollisionAbove(pData, pPhysics->hitboxTopOffset);
if (above == SAMUS_COLLISION_DETECTION_LEFT_MOST ||
above == (SAMUS_COLLISION_DETECTION_LEFT_MOST | SAMUS_COLLISION_DETECTION_MIDDLE_LEFT))
{
pData->xPosition = (pData->xPosition & BLOCK_POSITION_FLAG) - pPhysics->hitboxLeftOffset;
}
else if (above == SAMUS_COLLISION_DETECTION_RIGHT_MOST ||
above == (SAMUS_COLLISION_DETECTION_RIGHT_MOST | SAMUS_COLLISION_DETECTION_MIDDLE_RIGHT))
{
pData->xPosition = (pData->xPosition & BLOCK_POSITION_FLAG) - pPhysics->hitboxRightOffset + SUB_PIXEL_POSITION_FLAG;
}
if (pData->standingStatus != STANDING_ENEMY)
{
if (SamusSlopeRelated(pData->xPosition + pPhysics->hitboxLeftOffset, pData->yPosition + 1,
&xPosition, &yPosition, &slope) == CLIPDATA_TYPE_AIR)
{
if (SamusSlopeRelated(pData->xPosition + pPhysics->hitboxRightOffset, pData->yPosition + 1,
&xPosition, &yPosition, &slope) == CLIPDATA_TYPE_AIR)
return SPOSE_UPDATE_JUMP_VELOCITY_REQUEST;
}
}
return SPOSE_NONE;
}
u8 SamusCheckLandingCollision(struct SamusData* pData, struct SamusPhysics* pPhysics)

13
src/sprites_AI/parasite.c
View File

@ -567,11 +567,14 @@ void ParasiteJumpingDown(struct SpriteData* pSprite)
}
}
/**
* @brief 3080c | c0 | Handles a parasite (multiple) jumping (going down)
*
* @param pSprite Sprite data pointer
*/
void ParasiteMultipleJumpingDown(struct SpriteData* pSprite)
{
// https://decomp.me/scratch/QQNcN
u16 yPosition;
i32 yPosition;
u16 xPosition;
u32 topEdge;
i32 velocity;
@ -591,14 +594,14 @@ void ParasiteMultipleJumpingDown(struct SpriteData* pSprite)
xPosition = pSprite->xPosition;
// Check ground
if (ClipdataProcess(yPosition, xPosition) & CLIPDATA_TYPE_SOLID_FLAG && yPosition > yPosition & BLOCK_POSITION_FLAG)
if (ClipdataProcess(yPosition, xPosition) & CLIPDATA_TYPE_SOLID_FLAG && yPosition >= (yPosition & BLOCK_POSITION_FLAG))
{
pSprite->pOam = sParasiteOAM_Landing;
pSprite->currentAnimationFrame = 0x0;
pSprite->animationDurationCounter = 0x0;
pSprite->pose = PARASITE_POSE_LANDING;
pSprite->yPosition = yPosition & BLOCK_POSITION_FLAG;
pSprite->yPosition = (u16)yPosition & BLOCK_POSITION_FLAG;
}
else
{