From a3b4dcf388f7b424aedce4e9e8b130fa5c82a5d9 Mon Sep 17 00:00:00 2001 From: fig02 Date: Mon, 15 Nov 2021 16:33:44 -0500 Subject: 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 Co-authored-by: Thar0 <17233964+Thar0@users.noreply.github.com> Co-authored-by: mzxrules Co-authored-by: petrie911 Co-authored-by: Roman971 Co-authored-by: Louis --- src/code/code_800EC960.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/code/code_800EC960.c') diff --git a/src/code/code_800EC960.c b/src/code/code_800EC960.c index afae2a59c..3dad66642 100644 --- a/src/code/code_800EC960.c +++ b/src/code/code_800EC960.c @@ -519,15 +519,15 @@ void func_800EC960(u8 custom) { void Audio_GetOcaInput(void) { Input inputs[4]; - Input* controller1 = &inputs[0]; + Input* input = &inputs[0]; u32 sp18; sp18 = sCurOcarinaBtnPress; PadMgr_RequestPadData(&gPadMgr, inputs, 0); - sCurOcarinaBtnPress = controller1->cur.button; + sCurOcarinaBtnPress = input->cur.button; sPrevOcarinaBtnPress = sp18; - sCurOcaStick.x = controller1->rel.stick_x; - sCurOcaStick.y = controller1->rel.stick_y; + sCurOcaStick.x = input->rel.stick_x; + sCurOcaStick.y = input->rel.stick_y; } f32 Audio_OcaAdjStick(s8 inp) { -- cgit v1.2.3