diff options
| author | silv3rwing07 <62714207+silv3rwing07@users.noreply.github.com> | 2020-04-14 10:17:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-14 13:17:25 -0400 |
| commit | 5aef81071e501fbbe5298a433ead06a625cdb3d8 (patch) | |
| tree | 686ccf568a7f05bd7741be96cd22f51d358451d4 /src/code/graph.c | |
| parent | 16646aa34d533b36e3a93985ae59cbefdf58b6d4 (diff) | |
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
Diffstat (limited to 'src/code/graph.c')
| -rw-r--r-- | src/code/graph.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/graph.c b/src/code/graph.c index 5e1d2563d..600c2287f 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -387,8 +387,8 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { } sGraphUpdateTime = time; - if (D_8012DBC0 && (!~(gameState->input[0].padPressed | ~Z_TRIG)) && - (!~(gameState->input[0].raw.pad | ~(L_TRIG | R_TRIG)))) { + if (D_8012DBC0 && (!~(gameState->input[0].press.in.button | ~Z_TRIG)) && + (!~(gameState->input[0].cur.in.button | ~(L_TRIG | R_TRIG)))) { gSaveContext.game_mode = 0; SET_NEXT_GAMESTATE(gameState, func_80801E44, char[0x240]); // TODO : SelectContext gameState->running = false; |