From 5aef81071e501fbbe5298a433ead06a625cdb3d8 Mon Sep 17 00:00:00 2001 From: silv3rwing07 <62714207+silv3rwing07@users.noreply.github.com> Date: Tue, 14 Apr 2020 10:17:25 -0700 Subject: padmgr and related (#71) * In process of moving changes over from old repo * Merged in changes * Finished import of padmgr changes from old repo * Adjusted some volatile * Improving padmgr volatile situation * Almost matched osReadMempak * Working on osMempakDataCRC * Explanations and equivalents but no matches for osMempakAddrCRC and osMempakDataCRC * OK after merge * Matched osMempakAddrCRC and osMempakDataCRC * Matched osReadMempak * Updated PadMgr function names to be less like original code * Changed variable names to make them further from original code * Changed names and it stopped matching * Undid clang-format steamrollering whitespace memes * Cleaned up Input names * More formatting changes * Moved padmgr to z64.h, deleted padmgr.h --- src/code/z_sample.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/code/z_sample.c') diff --git a/src/code/z_sample.c b/src/code/z_sample.c index ee7bf3caa..38add9d42 100644 --- a/src/code/z_sample.c +++ b/src/code/z_sample.c @@ -3,7 +3,7 @@ #include void Sample_Calc(SampleContext* this) { - if (!~(this->state.input[0].padPressed | ~START_BUTTON)) { + if (!~(this->state.input[0].press.in.button | ~START_BUTTON)) { SET_NEXT_GAMESTATE(&this->state, func_800BCA64, GlobalContext); this->state.running = false; } -- cgit v1.2.3