diff options
| author | Random <28494085+Random06457@users.noreply.github.com> | 2020-10-03 17:22:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-03 11:22:44 -0400 |
| commit | 174af7384d1cfcbf15da02d9069bf02bdc433c20 (patch) | |
| tree | e4fb18346f71047c123ec4d34a80ae7e4d8ab9ea /src/code/graph.c | |
| parent | 6136ee6debd570a63fc695a6f4664553303f2324 (diff) | |
libultra cleanup (#215)
* cleanup libultra
* fixes
- use quotes instead of <> for includes
- add macros for zelda specific thread priorities
- fix Makefile
- properly format the remaining pfs structs
* fix button macros + add CHECK_BTN_ANY/CHECK_BTN_ALL
* remove ULTRA_ABS
* fix includes
* update z_player.c/z_lib.c + run format.sh
* merge upstream/master
* fix include in En_Goroiwa
* fix includes
Diffstat (limited to 'src/code/graph.c')
| -rw-r--r-- | src/code/graph.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/code/graph.c b/src/code/graph.c index dc958ff00..3ba23f9ff 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -1,7 +1,5 @@ -#include <global.h> -#include <ultra64/hardware.h> -#include <ultra64/controller.h> -#include <vt.h> +#include "global.h" +#include "vt.h" #define GFXPOOL_HEAD_MAGIC 0x1234 #define GFXPOOL_TAIL_MAGIC 0x5678 @@ -392,8 +390,8 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { sGraphUpdateTime = time; } - if (D_8012DBC0 && CHECK_PAD(gameState->input[0].press, Z_TRIG) && - CHECK_PAD(gameState->input[0].cur, L_TRIG | R_TRIG)) { + if (D_8012DBC0 && CHECK_BTN_ALL(gameState->input[0].press.button, BTN_Z) && + CHECK_BTN_ALL(gameState->input[0].cur.button, BTN_L | BTN_R)) { gSaveContext.gameMode = 0; SET_NEXT_GAMESTATE(gameState, Select_Init, SelectContext); gameState->running = false; |