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

Match ScrollScreen

Browse Source
This commit is contained in:
YohannDR 2022-12-01 15:34:08 +01:00
parent 32a456563e
commit aae2bb39c3
2 changed files with 62 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/scroll.h
View File

@ -8,7 +8,7 @@
#define SCREEN_HEIGHT (BLOCK_SIZE * 5)
void ScrollProcess(struct RawCoordsX* pCoords);
void ScrollScreen(u16 screen_x, u16 screen_y);
void ScrollScreen(u16 screenX, u16 screenY);
i32 ScrollProcessX(struct Scroll* pScroll, struct RawCoordsX* pCoords);
i32 ScrollProcessY(struct Scroll* pScroll, struct RawCoordsX* pCoords);
void ScrollLoad(void);

63
src/scroll.c
View File

@ -11,6 +11,11 @@
#include "structs/samus.h"
#include "structs/room.h"
/**
* @brief 582c4 | 64 | Processes the current scrolls
*
* @param pCoords Coordinates pointer
*/
void ScrollProcess(struct RawCoordsX* pCoords)
{
u32 screenX;
@ -38,12 +43,66 @@ void ScrollProcess(struct RawCoordsX* pCoords)
screenY = (i32)(screenY + newPosition) >> 0x1;
}
ScrollScreen((u16)screenX, (u16)screenY);
ScrollScreen(screenX, screenY);
}
void ScrollScreen(u16 screen_x, u16 screen_y)
/**
* @brief 58328 | bc | Scrolls the screen to the provided position
*
* @param screenX Screen Y
* @param screenY Screen X
*/
void ScrollScreen(u16 screenX, u16 screenY)
{
i32 velocity;
gCamera.xPosition = screenX;
gCamera.yPosition = screenY;
if (gGameModeSub1 == 0)
return;
if (screenY != gBG1YPosition)
{
velocity = screenY - gBG1YPosition;
if (velocity > 0)
{
if (gUnk_3005714.unk6 < velocity)
velocity = gUnk_3005714.unk6;
}
else
{
if (gUnk_3005714.unk4 > velocity)
velocity = gUnk_3005714.unk4;
}
gCamera.yVelocity = velocity;
gBG1YPosition += velocity;
}
else
gCamera.yVelocity = 0;
if (screenX != gBG1XPosition)
{
velocity = screenX - gBG1XPosition;
if (velocity > 0)
{
if (gUnk_3005714.unk2 < velocity)
velocity = gUnk_3005714.unk2;
}
else
{
if (gUnk_3005714.unk0 > velocity)
velocity = gUnk_3005714.unk0;
}
gCamera.xVelocity = velocity;
gBG1XPosition += velocity;
}
else
gCamera.xVelocity = 0;
}
i32 ScrollProcessX(struct Scroll* pScroll, struct RawCoordsX* pCoords)