diff options
| author | fig02 <fig02srl@gmail.com> | 2021-11-15 16:33:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-15 22:33:44 +0100 |
| commit | a3b4dcf388f7b424aedce4e9e8b130fa5c82a5d9 (patch) | |
| tree | 26744d234569c3c8cd37d2e414521d62aa6e37e2 /src/code/z_parameter.c | |
| parent | 768f0c2c88a77eb5ccc46c14125d5949f699a468 (diff) | |
File Select (z_file_choose) OK (#1012)
* matching split
* migrate progress
* split done and rodata migrated
* all data migrated to c
* start init
* progress
* progress
* progress
* progress
* progress
* progress
* copy done
* progress
* erase and settings done
* progress
* progress
* progress
* start keyboard
* progress
* progress
* progress
* progress
* Minor progress
* fix z_magic_dark issue
* func_80806F34 decomp'd
* verified equivalence
* one fix
* format
* merge petries work
* reorganizing
* lots of reorganizing and wraning fixing
* rename file
* remove language enum
* unwanted changes
* some symbol replacement, organization, and some names
* all symbols replaced, some organization
* some more cleanup
* continue docs
* Match the remaining functions in file_choose
* merge master
* select mode documented, all functions in file_choose.c named
* nameset functions named, some other cleaning
* some more general cleanup
* stub comments for cm, name a few things
* fix data and sizeof
* copy/erase functions and modes named
* rename assets, format
* change some struct members
* fixes
* review1
* fix maching error
* extract VTX data
* re add werror to ZAPD
* review 2
* fix
* remove file boundary padding
* remove zeroes
* review3
* change skybox stuff
* changes to vs etc
Co-authored-by: KrimtonZ <krimtonz@gmail.com>
Co-authored-by: Thar0 <17233964+Thar0@users.noreply.github.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Roman971 <romanlasnier@hotmail.com>
Co-authored-by: Louis <louist103@gmail.com>
Diffstat (limited to 'src/code/z_parameter.c')
| -rw-r--r-- | src/code/z_parameter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index cca781945..26a926126 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -3796,15 +3796,15 @@ void Interface_Update(GlobalContext* globalCtx) { s16 alpha; s16 alpha1; u16 action; - Input* input = &globalCtx->state.input[2]; + Input* debugInput = &globalCtx->state.input[2]; - if (CHECK_BTN_ALL(input->press.button, BTN_DLEFT)) { + if (CHECK_BTN_ALL(debugInput->press.button, BTN_DLEFT)) { gSaveContext.language = 0; osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); - } else if (CHECK_BTN_ALL(input->press.button, BTN_DUP)) { + } else if (CHECK_BTN_ALL(debugInput->press.button, BTN_DUP)) { gSaveContext.language = 1; osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); - } else if (CHECK_BTN_ALL(input->press.button, BTN_DRIGHT)) { + } else if (CHECK_BTN_ALL(debugInput->press.button, BTN_DRIGHT)) { gSaveContext.language = 2; osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); } |