mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-07 02:05:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Matched

Browse Source
This commit is contained in:
Derek Hensley
2021-11-10 07:40:18 -08:00
parent 6b4c24014e
commit 6d6c973d27
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+2 -2
View File
@@ -2176,8 +2176,8 @@ void func_80121FC4(GlobalContext* globalCtx);
Path* Path_GetByIndex(GlobalContext* globalCtx, s16 index, s16 max);
f32 Path_OrientAndGetDistSq(Actor* actor, Path* path, s16 waypoint, s16* yaw);
void Path_CopyLastPoint(Path* path, Vec3f* dest);
// void func_80122660(void);
// UNK_TYPE4 func_80122670(s32* param_1, Input* input);
void func_80122660(FrameAdvanceContext* frameAdvCtx);
s32 func_80122670(FrameAdvanceContext* frameAdvCtx, Input* input);
// void func_801226E0(void);
void func_80122744(GlobalContext* globalCtx, UNK_PTR arg1, u32 arg2, Vec3s* arg3);
s32 func_80122760(GlobalContext* globalCtx, UNK_PTR arg1, f32 arg2);
src/code/z_pause.c
+13 -2
View File
@@ -1,5 +1,16 @@
#include "global.h"
#pragma GLOBAL_ASM("asm/non_matchings/code/z_pause/func_80122660.s")
void func_80122660(FrameAdvanceContext* frameAdvCtx) {
frameAdvCtx->timer = 0;
frameAdvCtx->enabled = false;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_pause/func_80122670.s")
s32 func_80122670(FrameAdvanceContext* frameAdvCtx, Input* input) {
if (!frameAdvCtx->enabled || (CHECK_BTN_ALL(input->cur.button, BTN_Z) &&
(CHECK_BTN_ALL(input->press.button, BTN_R) ||
(CHECK_BTN_ALL(input->cur.button, BTN_R) && (++frameAdvCtx->timer >= 9))))) {
frameAdvCtx->timer = 0;
return true;
}
return false;
}