diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-08-07 16:01:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-07 16:01:46 -0700 |
| commit | 22cbdd2fd645a5525a6ef0c9b8ee8ec11af9e9aa (patch) | |
| tree | bba486c0af6698f2366f14cbf4b092b981f9e107 /src/manager | |
| parent | e26311d0997e919b16e193aa57ecc4384a1b0140 (diff) | |
| parent | c45195c57754b1c802a2bae3e473df01bed4cd85 (diff) | |
Merge pull request #553 from hatal175/document
Diffstat (limited to 'src/manager')
| -rw-r--r-- | src/manager/ezloHintManager.c | 2 | ||||
| -rw-r--r-- | src/manager/minishRaftersBackgroundManager.c | 5 | ||||
| -rw-r--r-- | src/manager/staticBackgroundManager.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/manager/ezloHintManager.c b/src/manager/ezloHintManager.c index bf7e4ad2..c6aa5183 100644 --- a/src/manager/ezloHintManager.c +++ b/src/manager/ezloHintManager.c @@ -103,7 +103,7 @@ static u32 PlayerStateValid(EzloHintManager* this) { case PL_STATE_DROWN: case PL_STATE_HOLE: case PL_STATE_CLIMB: - case PL_STATE_1B: + case PL_STATE_SINKING: case PL_STATE_STAIRS: return 0; case PL_STATE_6: diff --git a/src/manager/minishRaftersBackgroundManager.c b/src/manager/minishRaftersBackgroundManager.c index e55e989b..8bc52447 100644 --- a/src/manager/minishRaftersBackgroundManager.c +++ b/src/manager/minishRaftersBackgroundManager.c @@ -46,9 +46,10 @@ u32 sub_08058244(int i) { s32 tmp2; u32 tmp3; s32 tmp4; - tmp = ((gRoomControls.scroll_y - gRoomControls.origin_y) * 0x20) / (gRoomControls.height - 0xa0); + tmp = ((gRoomControls.scroll_y - gRoomControls.origin_y) * 0x20) / (gRoomControls.height - DISPLAY_HEIGHT); gScreen.bg1.yOffset = gRoomControls.origin_y + tmp; - tmp = (((gRoomControls.scroll_x - gRoomControls.origin_x) * gUnk_081081EC[i]) / (gRoomControls.width - 0xf0)); + tmp = (((gRoomControls.scroll_x - gRoomControls.origin_x) * gUnk_081081EC[i]) / + (gRoomControls.width - DISPLAY_WIDTH)); gScreen.bg1.xOffset = tmp & 0xf; return tmp; } diff --git a/src/manager/staticBackgroundManager.c b/src/manager/staticBackgroundManager.c index 156aa35d..f069196c 100644 --- a/src/manager/staticBackgroundManager.c +++ b/src/manager/staticBackgroundManager.c @@ -57,7 +57,7 @@ void sub_0805B448(StaticBackgroundManager* this) { } void sub_0805B474(StaticBackgroundManager* this) { - s32 tmp = ((gRoomControls.scroll_y - gRoomControls.origin_y) * 0x60) / (gRoomControls.height - 0xa0); + s32 tmp = ((gRoomControls.scroll_y - gRoomControls.origin_y) * 0x60) / (gRoomControls.height - DISPLAY_HEIGHT); gScreen.bg3.yOffset = gRoomControls.origin_y + tmp; gScreen.bg3.xOffset = gRoomControls.scroll_x - ((gRoomControls.width - 0x100) / 2); } |