Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Card region check #3

Merged
merged 11 commits into from
Apr 11, 2018
Merged

Card region check #3

merged 11 commits into from
Apr 11, 2018

Conversation

noirscape
Copy link
Owner

If this Pull Request is merged, this closes issues #1 and #2 on dev.

Implements checking for cards (prioritized over save data) and mismatched region installs (it tries to autodetermine, and if it locates multiple, the program prompts for which one to use).

Will merge after adequate testing.

Also got rid of the if blocks in favor of a switch statement and removed some needless functions + improved general style consistency.

@noirscape
Copy link
Owner Author

Merging a bit early since there is other work I want to do but as this branch also has an effective rewrite of the main loop, it's holding up my workflow.

@noirscape noirscape merged commit 028782d into dev Apr 11, 2018
@noirscape noirscape deleted the card-region-check branch April 11, 2018 09:13
noirscape added a commit that referenced this pull request Apr 13, 2018
commit de4b4ef
Author: ev1l0rd <[email protected]>
Date:   Fri Apr 13 21:50:46 2018 +0200

    Hotfix

commit bb7ba51
Author: ev1l0rd <[email protected]>
Date:   Fri Apr 13 21:17:17 2018 +0200

    Travis fixes

commit b503303
Author: ev1l0rd <[email protected]>
Date:   Fri Apr 13 17:36:18 2018 +0200

    Travis + Linguist

commit 8b5fea0
Author: Ev1l0rd <[email protected]>
Date:   Fri Apr 13 00:08:55 2018 +0200

    License headers added, removed Known Issues and thanked @Sonlen1414
    for beta testing.

commit 739935f
Author: ev1l0rd <[email protected]>
Date:   Thu Apr 12 15:23:39 2018 +0200

    Preventing fallthrough of FAILURE state

commit ab68bf2
Merge: 82fa640 2f89d46
Author: Valentijn <[email protected]>
Date:   Thu Apr 12 14:17:48 2018 +0200

    Merge pull request #7 from ev1l0rd/go-back

    Add restart functionality + Screen wiping

commit 2f89d46
Author: ev1l0rd <[email protected]>
Date:   Thu Apr 12 14:12:05 2018 +0200

    Handle an edge case where someone presses L on MAIN_SCREEN

commit 18d0162
Author: ev1l0rd <[email protected]>
Date:   Thu Apr 12 13:48:35 2018 +0200

    ohgodwhat

    that printf shouldve been called only once :sweat_smile:

    Also moved the window clean step _after_ the reset since it was messing
    with the main menu.

commit f22a8c3
Author: ev1l0rd <[email protected]>
Date:   Thu Apr 12 13:34:47 2018 +0200

    Added new failure state to account for failures w/ the new screen clean
    function.

commit 5f089f6
Author: ev1l0rd <[email protected]>
Date:   Thu Apr 12 13:24:54 2018 +0200

    Clean out print statements from source files other than main.c

    Also added consoleClear()s for every state change on the top screen.

    Tried to outline bottom screen messages a bit better to account for less
    screen space.

commit b48748d
Author: ev1l0rd <[email protected]>
Date:   Thu Apr 12 12:56:17 2018 +0200

    Added back functionality to the L button and fixed a minor print fail
    for save info

commit 82fa640
Merge: 028782d aafb8a8
Author: Valentijn <[email protected]>
Date:   Thu Apr 12 11:13:22 2018 +0200

    Merge pull request #6 from ev1l0rd/edit_profile-split

    Split up edit_profile.c into save.c

commit aafb8a8
Author: ev1l0rd <[email protected]>
Date:   Thu Apr 12 10:58:50 2018 +0200

    Resolves an unbroken switch statement + removed a pointless parameter.

commit 3762763
Author: ev1l0rd <[email protected]>
Date:   Thu Apr 12 10:53:27 2018 +0200

    Print selection info to the bottom screen instead of the top screen.

commit 69ca51c
Author: ev1l0rd <[email protected]>
Date:   Thu Apr 12 10:32:13 2018 +0200

    Split up final parts

commit 17b0843
Author: ev1l0rd <[email protected]>
Date:   Wed Apr 11 17:38:37 2018 +0200

    Moved closing everything to its own function in save.c

commit b35ce5f
Author: ev1l0rd <[email protected]>
Date:   Wed Apr 11 17:25:09 2018 +0200

    Added savedata readouts (not very well optimized)

commit 14f1696
Author: ev1l0rd <[email protected]>
Date:   Wed Apr 11 16:29:29 2018 +0200

    Savedata checking in much the same manner as checking for dupe copies.

commit 34ac5bb
Author: ev1l0rd <[email protected]>
Date:   Wed Apr 11 12:41:00 2018 +0200

    Initial work on splitting up for save detection

commit 028782d
Merge: d13c9c2 f2f5bf8
Author: Valentijn <[email protected]>
Date:   Wed Apr 11 11:13:07 2018 +0200

    Merge pull request #3 from ev1l0rd/card-region-check

    Card region check

commit f2f5bf8
Author: ev1l0rd <[email protected]>
Date:   Tue Apr 10 23:00:18 2018 +0200

    Ternary operator for checking

commit ef512f1
Author: ev1l0rd <[email protected]>
Date:   Tue Apr 10 19:28:21 2018 +0200

    Added more gamecard changes to editprofile.c that I missed.

    Also fixed a minor issue where if you had two regions, you could also
    select the third region, even if you didnt have it installed.

commit 024203c
Author: ev1l0rd <[email protected]>
Date:   Tue Apr 10 17:24:04 2018 +0200

    Adjust FS_MediaType in editprofile.c to actually be able to read from
    the gamecard

commit 7cd8745
Author: ev1l0rd <[email protected]>
Date:   Tue Apr 10 17:08:22 2018 +0200

    More robust text prompts for later modifications

commit fd615c8
Author: ev1l0rd <[email protected]>
Date:   Tue Apr 10 16:54:38 2018 +0200

    Removed pointless functions, fixed incorrect prompt and did general code
    reformatting.

    (main.h is now pointless)

commit 0c015f5
Author: ev1l0rd <[email protected]>
Date:   Tue Apr 10 15:47:02 2018 +0200

    Prompt for multiple regions found

commit 12986b2
Author: ev1l0rd <[email protected]>
Date:   Tue Apr 10 15:15:57 2018 +0200

    Using a switch instead of the if blocks

    switch = more adaptable for later + this code was making me annoyed.

commit c832153
Author: ev1l0rd <[email protected]>
Date:   Tue Apr 10 14:47:19 2018 +0200

    Added region autodetect, header guarding and moved structs to their own
    file.

commit 9612a9c
Author: ev1l0rd <[email protected]>
Date:   Tue Apr 10 13:53:49 2018 +0200

    Switch to using bools over ints

commit d9361f2
Author: ev1l0rd <[email protected]>
Date:   Tue Apr 10 13:50:29 2018 +0200

    TWL/CTR card checking

commit da499b9
Author: ev1l0rd <[email protected]>
Date:   Mon Apr 9 21:58:12 2018 +0200

    Initial case of card and region checks

    Checks don't do anything yet aside from displaying warnings.

commit d13c9c2
Author: ev1l0rd <[email protected]>
Date:   Sun Apr 8 23:11:00 2018 +0200

    Using the enum properly.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant