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/z_sample.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/z_sample.c')
| -rw-r--r-- | src/code/z_sample.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/code/z_sample.c b/src/code/z_sample.c index 59ad5a59b..d5383b373 100644 --- a/src/code/z_sample.c +++ b/src/code/z_sample.c @@ -1,9 +1,7 @@ -#include <ultra64.h> -#include <ultra64/controller.h> -#include <global.h> +#include "global.h" void Sample_HandleStateChange(SampleContext* this) { - if (CHECK_PAD(this->state.input[0].press, START_BUTTON)) { + if (CHECK_BTN_ALL(this->state.input[0].press.button, BTN_START)) { SET_NEXT_GAMESTATE(&this->state, Gameplay_Init, GlobalContext); this->state.running = false; } |