2024-10-31 23:45:13 +01:00
23 changed files with 218 additions and 6520 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,10 +0,0 @@
 version: 2
 updates:
  - package-ecosystem: "docker"
    directory: "/"
    schedule:
      interval: "daily"
  - package-ecosystem: "github-actions"
    directory: "/"
    schedule:
      interval: "daily"
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -7,24 +7,17 @@ on:
 jobs:
  clang-format:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-18.04
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
    - name: clang-format
      run: |
-        docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./src
+        docker run --rm -v ${PWD}:/src  wiiuenv/clang-format:13.0.0-2 -r ./src
  build-binary:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-18.04
    needs: clang-format
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
    - name: create version.h
      run: |
        git_hash=$(git rev-parse --short "$GITHUB_SHA")
        cat <<EOF > ./src/version.h
        #pragma once
        #define VERSION_EXTRA " (nightly-$git_hash)"
        EOF
    - name: build binary
      run: |
        docker build . -t builder
@ -35,7 +28,7 @@ jobs:
       path: "*.wms"
  deploy-binary:
    needs: build-binary
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-18.04
    steps:   
    - name: Get environment variables
      id: get_repository_name
@ -48,12 +41,25 @@ jobs:
    - name: zip artifact
      run: zip -r ${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip *.wms
    - name: Create Release
-      uses: "softprops/action-gh-release@v2"
+      id: create_release
      uses: actions/create-release@v1
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        tag_name: ${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }}
        release_name: Nightly-${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }}
        draft: false
        prerelease: true
-        generate_release_notes: true
+        body: |
-        name: Nightly-${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }}
+           Not a stable release:
-        files: |
+           ${{ github.event.head_commit.message }}
-          ./${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip
+    - name: Upload Release Asset
      id: upload-release-asset 
      uses: actions/upload-release-asset@v1
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
        asset_path: ./${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip
        asset_name: ${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip
        asset_content_type: application/zip
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@ -4,17 +4,17 @@ on: [pull_request]
 jobs:
  clang-format:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-18.04
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
    - name: clang-format
      run: |
-        docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./src
+        docker run --rm -v ${PWD}:/src  wiiuenv/clang-format:13.0.0-2 -r ./src
  check-build-with-logging:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-18.04
    needs: clang-format
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
    - name: build binary with logging
      run: |
        docker build . -t builder
@ -22,17 +22,10 @@ jobs:
        docker run --rm -v ${PWD}:/project builder make clean
        docker run --rm -v ${PWD}:/project builder make DEBUG=1
  build-binary:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-18.04
    needs: clang-format
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
    - name: create version.h
      run: |
        git_hash=$(git rev-parse --short "${{ github.event.pull_request.head.sha }}")
        cat <<EOF > ./src/version.h
        #pragma once
        #define VERSION_EXTRA " (nightly-$git_hash)"
        EOF
    - name: build binary
      run: |
        docker build . -t builder
--- a/.gitignore
+++ b/.gitignore
@ -8,4 +8,3 @@ build/
 cmake-build-debug/
 CMakeLists.txt
 *.wms
 *.zip
--- a/17
+++ b/17
@ -1,11 +1,10 @@
-FROM ghcr.io/wiiu-env/devkitppc:20240505
+FROM wiiuenv/devkitppc:20220417
-COPY --from=ghcr.io/wiiu-env/librpxloader:20240425 /artifacts $DEVKITPRO
+COPY --from=wiiuenv/librpxloader:20220417 /artifacts $DEVKITPRO
-COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230621 /artifacts $DEVKITPRO
+COPY --from=wiiuenv/libfunctionpatcher:20220211 /artifacts $DEVKITPRO
-COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20240424 /artifacts $DEVKITPRO
+COPY --from=wiiuenv/wiiumodulesystem:20220204 /artifacts $DEVKITPRO
-COPY --from=ghcr.io/wiiu-env/libwuhbutils:20230621 /artifacts $DEVKITPRO
+COPY --from=wiiuenv/libwuhbutils:20220415 /artifacts $DEVKITPRO
-COPY --from=ghcr.io/wiiu-env/libcontentredirection:20240424 /artifacts $DEVKITPRO
+COPY --from=wiiuenv/libcontentredirection:20220414 /artifacts $DEVKITPRO
-COPY --from=ghcr.io/wiiu-env/libromfs_wiiu:20240505 /artifacts $DEVKITPRO
+COPY --from=wiiuenv/libromfs_wiiu:20220414 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libmocha:20231127 /artifacts $DEVKITPRO
-WORKDIR project
+WORKDIR project
--- a/674
+++ b/674
@ -1,674 +0,0 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007
 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
                            Preamble
  The GNU General Public License is a free, copyleft license for
 software and other kinds of works.
  The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
 the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
 software for all its users.  We, the Free Software Foundation, use the
 GNU General Public License for most of our software; it applies also to
 any other work released this way by its authors.  You can apply it to
 your programs, too.
  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
  To protect your rights, we need to prevent others from denying you
 these rights or asking you to surrender the rights.  Therefore, you have
 certain responsibilities if you distribute copies of the software, or if
 you modify it: responsibilities to respect the freedom of others.
  For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must pass on to the recipients the same
 freedoms that you received.  You must make sure that they, too, receive
 or can get the source code.  And you must show them these terms so they
 know their rights.
  Developers that use the GNU GPL protect your rights with two steps:
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.
  For the developers' and authors' protection, the GPL clearly explains
 that there is no warranty for this free software.  For both users' and
 authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.
  Some devices are designed to deny users access to install or run
 modified versions of the software inside them, although the manufacturer
 can do so.  This is fundamentally incompatible with the aim of
 protecting users' freedom to change the software.  The systematic
 pattern of such abuse occurs in the area of products for individuals to
 use, which is precisely where it is most unacceptable.  Therefore, we
 have designed this version of the GPL to prohibit the practice for those
 products.  If such problems arise substantially in other domains, we
 stand ready to extend this provision to those domains in future versions
 of the GPL, as needed to protect the freedom of users.
  Finally, every program is threatened constantly by software patents.
 States should not allow patents to restrict development and use of
 software on general-purpose computers, but in those that do, we wish to
 avoid the special danger that patents applied to a free program could
 make it effectively proprietary.  To prevent this, the GPL assures that
 patents cannot be used to render the program non-free.
  The precise terms and conditions for copying, distribution and
 modification follow.
                       TERMS AND CONDITIONS
  0. Definitions.
  "This License" refers to version 3 of the GNU General Public License.
  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
  "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
  To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
 exact copy.  The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.
  A "covered work" means either the unmodified Program or a work based
 on the Program.
  To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
 computer or modifying a private copy.  Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.
  To "convey" a work means any kind of propagation that enables other
 parties to make or receive copies.  Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.
  An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
 work under this License, and how to view a copy of this License.  If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.
  1. Source Code.
  The "source code" for a work means the preferred form of the work
 for making modifications to it.  "Object code" means any non-source
 form of a work.
  A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.
  The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
 implementation is available to the public in source code form.  A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.
  The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
 control those activities.  However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
 which are not part of the work.  For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.
  The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.
  The Corresponding Source for a work in source code form is that
 same work.
  2. Basic Permissions.
  All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
 conditions are met.  This License explicitly affirms your unlimited
 permission to run the unmodified Program.  The output from running a
 covered work is covered by this License only if the output, given its
 content, constitutes a covered work.  This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.
  You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
 in force.  You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
 not control copyright.  Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.
  Conveying under any other circumstances is permitted solely under
 the conditions stated below.  Sublicensing is not allowed; section 10
 makes it unnecessary.
  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
  No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.
  When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
 modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.
  4. Conveying Verbatim Copies.
  You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
 non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
  You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
  5. Conveying Modified Source Versions.
  You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
    a) The work must carry prominent notices stating that you modified
    it, and giving a relevant date.
    b) The work must carry prominent notices stating that it is
    released under this License and any conditions added under section
    7.  This requirement modifies the requirement in section 4 to
    "keep intact all notices".
    c) You must license the entire work, as a whole, under this
    License to anyone who comes into possession of a copy.  This
    License will therefore apply, along with any applicable section 7
    additional terms, to the whole of the work, and all its parts,
    regardless of how they are packaged.  This License gives no
    permission to license the work in any other way, but it does not
    invalidate such permission if you have separately received it.
    d) If the work has interactive user interfaces, each must display
    Appropriate Legal Notices; however, if the Program has interactive
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.
  A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
 beyond what the individual works permit.  Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
  6. Conveying Non-Source Forms.
  You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
    a) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by the
    Corresponding Source fixed on a durable physical medium
    customarily used for software interchange.
    b) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by a
    written offer, valid for at least three years and valid for as
    long as you offer spare parts or customer support for that product
    model, to give anyone who possesses the object code either (1) a
    copy of the Corresponding Source for all the software in the
    product that is covered by this License, on a durable physical
    medium customarily used for software interchange, for a price no
    more than your reasonable cost of physically performing this
    conveying of source, or (2) access to copy the
    Corresponding Source from a network server at no charge.
    c) Convey individual copies of the object code with a copy of the
    written offer to provide the Corresponding Source.  This
    alternative is allowed only occasionally and noncommercially, and
    only if you received the object code with such an offer, in accord
    with subsection 6b.
    d) Convey the object code by offering access from a designated
    place (gratis or for a charge), and offer equivalent access to the
    Corresponding Source in the same way through the same place at no
    further charge.  You need not require recipients to copy the
    Corresponding Source along with the object code.  If the place to
    copy the object code is a network server, the Corresponding Source
    may be on a different server (operated by you or a third party)
    that supports equivalent copying facilities, provided you maintain
    clear directions next to the object code saying where to find the
    Corresponding Source.  Regardless of what server hosts the
    Corresponding Source, you remain obligated to ensure that it is
    available for as long as needed to satisfy these requirements.
    e) Convey the object code using peer-to-peer transmission, provided
    you inform other peers where the object code and Corresponding
    Source of the work are being offered to the general public at no
    charge under subsection 6d.
  A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
  A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
 into a dwelling.  In determining whether a product is a consumer product,
 doubtful cases shall be resolved in favor of coverage.  For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
 actually uses, or expects or is expected to use, the product.  A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.
  "Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
 a modified version of its Corresponding Source.  The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.
  If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
 by the Installation Information.  But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).
  The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
 the User Product in which it has been modified or installed.  Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.
  Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.
  7. Additional Terms.
  "Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
 that they are valid under applicable law.  If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
  When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
 it.  (Additional permissions may be written to require their own
 removal in certain cases when you modify the work.)  You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.
  Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
    a) Disclaiming warranty or limiting liability differently from the
    terms of sections 15 and 16 of this License; or
    b) Requiring preservation of specified reasonable legal notices or
    author attributions in that material or in the Appropriate Legal
    Notices displayed by works containing it; or
    c) Prohibiting misrepresentation of the origin of that material, or
    requiring that modified versions of such material be marked in
    reasonable ways as different from the original version; or
    d) Limiting the use for publicity purposes of names of licensors or
    authors of the material; or
    e) Declining to grant rights under trademark law for use of some
    trade names, trademarks, or service marks; or
    f) Requiring indemnification of licensors and authors of that
    material by anyone who conveys the material (or modified versions of
    it) with contractual assumptions of liability to the recipient, for
    any liability that these contractual assumptions directly impose on
    those licensors and authors.
  All other non-permissive additional terms are considered "further
 restrictions" within the meaning of section 10.  If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
 restriction, you may remove that term.  If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
  If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.
  Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
  8. Termination.
  You may not propagate or modify a covered work except as expressly
 provided under this License.  Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).
  However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.
  Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.
  Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
 this License.  If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.
  9. Acceptance Not Required for Having Copies.
  You are not required to accept this License in order to receive or
 run a copy of the Program.  Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
 to receive a copy likewise does not require acceptance.  However,
 nothing other than this License grants you permission to propagate or
 modify any covered work.  These actions infringe copyright if you do
 not accept this License.  Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
  10. Automatic Licensing of Downstream Recipients.
  Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
 propagate that work, subject to this License.  You are not responsible
 for enforcing compliance by third parties with this License.
  An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
 organization, or merging organizations.  If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
 give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.
  You may not impose any further restrictions on the exercise of the
 rights granted or affirmed under this License.  For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
  11. Patents.
  A "contributor" is a copyright holder who authorizes use under this
 License of the Program or a work on which the Program is based.  The
 work thus licensed is called the contributor's "contributor version".
  A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
 consequence of further modification of the contributor version.  For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.
  Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
  In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
 sue for patent infringement).  To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.
  If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
 then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
 license to downstream recipients.  "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
  If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
 or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
  A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
 specifically granted under this License.  You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
 the work, and under which the third party grants, to any of the
 parties who would receive the covered work from you, a discriminatory
 patent license (a) in connection with copies of the covered work
 conveyed by you (or copies made from those copies), or (b) primarily
 for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
  Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
  12. No Surrender of Others' Freedom.
  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
 not convey it at all.  For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
  13. Use with the GNU Affero General Public License.
  Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU Affero General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
 but the special requirements of the GNU Affero General Public License,
 section 13, concerning interaction through a network will apply to the
 combination as such.
  14. Revised Versions of this License.
  The Free Software Foundation may publish revised and/or new versions of
 the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
  Each version is given a distinguishing version number.  If the
 Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
 GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.
  If the Program specifies that a proxy can decide which future
 versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
  Later license versions may give you additional or different
 permissions.  However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.
  15. Disclaimer of Warranty.
  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
 IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  16. Limitation of Liability.
  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
 USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
 DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
 PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
  17. Interpretation of Sections 15 and 16.
  If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
                     END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
    {one line to give the program's name and a brief idea of what it does.}
    Copyright (C) {year}  {name of author}
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
  If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
    {project}  Copyright (C) {year}  {fullname}
    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
 The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License.  Of course, your program's commands
 might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
 <http://www.gnu.org/licenses/>.
  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/16
+++ b/16
@ -22,7 +22,6 @@ WUT_ROOT := $(DEVKITPRO)/wut
 TARGET		:=	RPXLoadingModule
 BUILD		:=	build
 SOURCES		:=	src \
                src/data \
                src/utils
 DATA		:=	data
 INCLUDES	:=	src
@ -38,7 +37,7 @@ CFLAGS	+=	$(INCLUDE) -D__WIIU__ -D__WUT__
 CXXFLAGS	:= $(CFLAGS) -std=c++20
 ASFLAGS	:=	-g $(ARCH)
-LDFLAGS	=	-g $(ARCH) $(RPXSPECS) -Wl,-Map,$(notdir $*.map) $(WUMSSPECS)
+LDFLAGS	=	-g $(ARCH) $(RPXSPECS) -Wl,-Map,$(notdir $*.map) -T$(WUMS_ROOT)/share/libfunctionpatcher.ld -Tcontentredirection.ld -Twuhbutils.ld $(WUMSSPECS)
 ifeq ($(DEBUG),1)
 CXXFLAGS += -DDEBUG -g
@ -50,7 +49,7 @@ CXXFLAGS += -DDEBUG -DVERBOSE_DEBUG -g
 CFLAGS += -DDEBUG -DVERBOSE_DEBUG -g
 endif
-LIBS	:= -lwums -lwut -lfunctionpatcher -lcontentredirection -lwuhbutils -lmocha -lromfs
+LIBS	:= -lwums -lwut -lfunctionpatcher -lcontentredirection -lwuhbutils -lromfs
 #-------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level
@ -77,6 +76,7 @@ export DEPSDIR	:=	$(CURDIR)/$(BUILD)
 CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
 CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
 SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
 DEFFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.def)))
 BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
 #-------------------------------------------------------------------------------
@ -94,7 +94,7 @@ endif
 #-------------------------------------------------------------------------------
 export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES))
-export OFILES_SRC	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
+export OFILES_SRC	:=	$(DEFFILES:.def=.o) $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
 export OFILES 	:=	$(OFILES_BIN) $(OFILES_SRC)
 export HFILES_BIN	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))
@ -110,7 +110,7 @@ export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
 all: $(BUILD)
 $(BUILD):
-	@$(shell [ ! -d $(BUILD) ] && mkdir -p $(BUILD))
+	@[ -d $@ ] || mkdir -p $@
 	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
 #-------------------------------------------------------------------------------
@ -138,7 +138,11 @@ $(OFILES_SRC)	: $(HFILES_BIN)
 #-------------------------------------------------------------------------------
 # you need a rule like this for each extension you use as binary data
 #-------------------------------------------------------------------------------
-   
+%.o: %.def
 	$(SILENTMSG) $(notdir $<)
 	$(SILENTCMD)rplimportgen $< $*.s $*.ld $(ERROR_FILTER)
 	$(SILENTCMD)$(CC) -x assembler-with-cpp $(ASFLAGS) -c $*.s -o $@ $(ERROR_FILTER)
 #---------------------------------------------------------------------------------
 %_bin.h %.bin.o	:	%.bin
 #---------------------------------------------------------------------------------
--- a/README.md
+++ b/README.md
@ -5,8 +5,8 @@
 1. Copy the file `RPXLoadingModule.wms` into `sd:/wiiu/environments/[ENVIRONMENT]/modules`.  
 2. Requires the [WUMSLoader](https://github.com/wiiu-env/WUMSLoader) in `sd:/wiiu/environments/[ENVIRONMENT]/modules/setup`.
-3. Requires the [ContentRedirectionModule](https://github.com/wiiu-env/ContentRedirectionModule) in `sd:/wiiu/environments/[ENVIRONMENT]/modules`.
+3. Requires the [ContentRedirectionModule](https://github.com/wiiu-env/ContentRedirectionModule) in `sd:/wiiu/environments/[ENVIRONMENT]/modules/setup`.
-4. Requires the [WUHBUtilsModule](https://github.com/wiiu-env/WUHBUtilsModule) in `sd:/wiiu/environments/[ENVIRONMENT]/modules`.
+4. Requires the [WUHBUtilsModule](https://github.com/wiiu-env/WUHBUtilsModule) in `sd:/wiiu/environments/[ENVIRONMENT]/modules/setup`.
 5. Use [librpxloading](https://github.com/wiiu-env/librpxloader)
 ## Buildflags
@ -37,4 +37,4 @@ docker run -it --rm -v ${PWD}:/project rpxloadingmodule-builder make clean
 ## Format the code via docker
-`docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./src -i`
+`docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./src -i`
--- a/src/RPXLoading.cpp
+++ b/src/RPXLoading.cpp
@ -1,5 +1,4 @@
 #include "RPXLoading.h"
 #include "data/defaultIcon.h"
 #include "globals.h"
 #include "utils/FileReader.h"
 #include "utils/StringTools.h"
@ -8,22 +7,22 @@
 #include <coreinit/cache.h>
 #include <coreinit/debug.h>
 #include <coreinit/ios.h>
 #include <coreinit/title.h>
 #include <cstring>
 #include <mocha/mocha.h>
 #include <mutex>
 #include <nn/acp/title.h>
 #include <romfs_dev.h>
 #include <rpxloader/rpxloader.h>
 #include <string>
 #include <sysapp/title.h>
 #include <wuhb_utils/utils.h>
 std::mutex fileReaderListMutex;
-std::forward_list<std::unique_ptr<FileReader>> openFileReaders;
+std::vector<FileReader *> openFileReaders;
 void RPXLoadingCleanUp() {
    const std::lock_guard<std::mutex> lock(fileReaderListMutex);
    for (auto &reader : openFileReaders) {
        delete reader;
    }
    openFileReaders.clear();
 }
@ -35,12 +34,11 @@ DECL_FUNCTION(int32_t, HBM_NN_ACP_ACPGetTitleMetaXmlByDevice, uint32_t titleid_u
        memset(&metaxml->longname_ja, 0, 0x338C - 0x38C); // clear all names
        snprintf(metaxml->longname_en, sizeof(metaxml->longname_en), "%s", gReplacementInfo.rpxReplacementInfo.metaInformation.longname);
-        snprintf(metaxml->shortname_en, sizeof(metaxml->shortname_en), "%s", gReplacementInfo.rpxReplacementInfo.metaInformation.shortname);
+        snprintf(metaxml->shortname_en, sizeof(metaxml->shortname_en), "%s", gReplacementInfo.rpxReplacementInfo.metaInformation.longname);
-        snprintf(metaxml->publisher_en, sizeof(metaxml->publisher_en), "%s", gReplacementInfo.rpxReplacementInfo.metaInformation.author);
+        snprintf(metaxml->publisher_en, sizeof(metaxml->publisher_en), "%s", gReplacementInfo.rpxReplacementInfo.metaInformation.longname);
-        // Disable the emanual
+        // Disbale the emanual
-        metaxml->e_manual    = 0;
+        metaxml->e_manual = 0;
        metaxml->closing_msg = 0;
        return 0;
    }
@ -48,18 +46,18 @@ DECL_FUNCTION(int32_t, HBM_NN_ACP_ACPGetTitleMetaXmlByDevice, uint32_t titleid_u
    return result;
 }
-DECL_FUNCTION(int, RPX_FSOpenFile, FSClient *client, FSCmdBlock *block, char *path, const char *mode, uint32_t *handle, int error) {
+DECL_FUNCTION(int, RPX_FSOpenFile, FSClient *client, FSCmdBlock *block, char *path, const char *mode, int *handle, int error) {
    const char *iconTex       = "iconTex.tga";
    std::string_view pathView = path;
    if (gReplacementInfo.rpxReplacementInfo.isRPXReplaced && pathView.ends_with(iconTex)) {
        const std::lock_guard<std::mutex> lock(fileReaderListMutex);
-        auto reader = make_unique_nothrow<FileReader>(reinterpret_cast<uint8_t *>(gReplacementInfo.rpxReplacementInfo.iconCache), ICON_SIZE);
+        auto *reader = new (std::nothrow) FileReader(reinterpret_cast<uint8_t *>(gReplacementInfo.rpxReplacementInfo.iconCache), ICON_SIZE);
        if (!reader) {
            DEBUG_FUNCTION_LINE_ERR("Failed to allocate memory for the FileReader");
            return FS_STATUS_FATAL_ERROR;
        }
-        *handle = reader->getHandle();
+        openFileReaders.push_back(reader);
-        openFileReaders.push_front(std::move(reader));
+        *handle = reinterpret_cast<int>(reader);
        return FS_STATUS_OK;
    }
    int result = real_RPX_FSOpenFile(client, block, path, mode, handle, error);
@ -70,7 +68,7 @@ DECL_FUNCTION(FSStatus, RPX_FSReadFile, FSClient *client, FSCmdBlock *block, uin
    if (gReplacementInfo.rpxReplacementInfo.isRPXReplaced) {
        const std::lock_guard<std::mutex> lock(fileReaderListMutex);
        for (auto &reader : openFileReaders) {
-            if ((uint32_t) reader->getHandle() == (uint32_t) handle) {
+            if ((uint32_t) reader == (uint32_t) handle) {
                return (FSStatus) (reader->read(buffer, size * count) / size);
            }
        }
@ -80,7 +78,21 @@ DECL_FUNCTION(FSStatus, RPX_FSReadFile, FSClient *client, FSCmdBlock *block, uin
 DECL_FUNCTION(FSStatus, RPX_FSCloseFile, FSClient *client, FSCmdBlock *block, FSFileHandle handle, uint32_t flags) {
    if (gReplacementInfo.rpxReplacementInfo.isRPXReplaced) {
-        if (remove_locked_first_if(fileReaderListMutex, openFileReaders, [handle](auto &cur) { return cur->getHandle() == (uint32_t) handle; })) {
+        const std::lock_guard<std::mutex> lock(fileReaderListMutex);
        bool found         = false;
        int index          = 0;
        FileReader *reader = nullptr;
        for (auto &cur : openFileReaders) {
            if ((uint32_t) cur == (uint32_t) handle) {
                found  = true;
                reader = cur;
                break;
            }
            index++;
        }
        if (found) {
            openFileReaders.erase(openFileReaders.begin() + index);
            delete reader;
            return FS_STATUS_OK;
        }
    }
@ -88,32 +100,15 @@ DECL_FUNCTION(FSStatus, RPX_FSCloseFile, FSClient *client, FSCmdBlock *block, FS
    return real_RPX_FSCloseFile(client, block, handle, flags);
 }
-RPXLoaderStatus RL_PrepareLaunchFromSD(const char *bundle_path);
+DECL_FUNCTION(void, Loader_ReportWarn) {
 DECL_FUNCTION(void, OSRestartGame, int argc, char *argv[]) {
    if (OSGetTitleID() == _SYSGetSystemApplicationTitleId(SYSTEM_APP_ID_HEALTH_AND_SAFETY) &&
        strlen(gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath) == 0) {
        RL_PrepareLaunchFromSD(gReplacementInfo.lastFileLoaded);
    }
    real_OSRestartGame(argc, argv);
 }
 DECL_FUNCTION(void, _SYSLaunchTitleWithStdArgsInNoSplash, uint64_t titleId, void *u1) {
    if (titleId == _SYSGetSystemApplicationTitleId(SYSTEM_APP_ID_HEALTH_AND_SAFETY) &&
        titleId == OSGetTitleID() &&
        strlen(gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath) == 0) {
        RL_PrepareLaunchFromSD(gReplacementInfo.lastFileLoaded);
    }
    real__SYSLaunchTitleWithStdArgsInNoSplash(titleId, u1);
 }
 function_replacement_data_t rpx_utils_function_replacements[] = {
        REPLACE_FUNCTION_VIA_ADDRESS(Loader_ReportWarn, 0x32002f74, 0x01002f74),
        REPLACE_FUNCTION_VIA_ADDRESS_FOR_PROCESS(HBM_NN_ACP_ACPGetTitleMetaXmlByDevice, 0x2E36CE44, 0x0E36CE44, FP_TARGET_PROCESS_HOME_MENU),
        REPLACE_FUNCTION_FOR_PROCESS(RPX_FSOpenFile, LIBRARY_COREINIT, FSOpenFile, FP_TARGET_PROCESS_HOME_MENU),
        REPLACE_FUNCTION_FOR_PROCESS(RPX_FSReadFile, LIBRARY_COREINIT, FSReadFile, FP_TARGET_PROCESS_HOME_MENU),
        REPLACE_FUNCTION_FOR_PROCESS(RPX_FSCloseFile, LIBRARY_COREINIT, FSCloseFile, FP_TARGET_PROCESS_HOME_MENU),
        REPLACE_FUNCTION(OSRestartGame, LIBRARY_COREINIT, OSRestartGame),
        REPLACE_FUNCTION(_SYSLaunchTitleWithStdArgsInNoSplash, LIBRARY_SYSAPP, _SYSLaunchTitleWithStdArgsInNoSplash),
 };
 uint32_t rpx_utils_function_replacements_size = sizeof(rpx_utils_function_replacements) / sizeof(function_replacement_data_t);
@ -138,26 +133,20 @@ static int parseINIhandler(void *user, const char *section, const char *name,
    return 1;
 }
-RPXLoaderStatus RL_PrepareLaunchFromSD(const char *bundle_path) {
+bool RL_LoadFromSDOnNextLaunch(const char *bundle_path) {
-    MochaRPXLoadInfo request;
+    LOAD_REQUEST request;
    memset(&request, 0, sizeof(request));
-    request.target     = LOAD_RPX_TARGET_SD_CARD; // LOAD_FILE_TARGET_SD_CARD
+    request.command    = 0xFC; // IPC_CUSTOM_LOAD_CUSTOM_RPX;
-    request.filesize   = 0;                       // unknown filesize
+    request.target     = 0;    // LOAD_FILE_TARGET_SD_CARD
-    request.fileoffset = 0;                       //
+    request.filesize   = 0;    // unknown filesize
    request.fileoffset = 0;    //
    WUHBRPXInfo fileInfo;
    bool metaLoaded = false;
-    std::string completePath       = std::string("/vol/external01/") + bundle_path;
+    std::string completePath = std::string("/vol/external01/") + bundle_path;
    std::string completeNewLibPath = std::string("fs:/vol/external01/") + bundle_path;
    struct stat st {};
    if (stat(completeNewLibPath.c_str(), &st) < 0) {
        DEBUG_FUNCTION_LINE_ERR("Failed to prepare launch from SD, file (%s) not found.", bundle_path);
        return RPX_LOADER_RESULT_NOT_FOUND;
    }
    bool isBundle = false;
    auto rpxInfo  = WUHBUtils_GetRPXInfo(completePath.c_str(), BundleSource_FileDescriptor_CafeOS, &fileInfo);
@ -193,7 +182,6 @@ RPXLoaderStatus RL_PrepareLaunchFromSD(const char *bundle_path) {
                memcpy(gReplacementInfo.rpxReplacementInfo.iconCache, buffer, cpySize);
                free(buffer);
            } else {
                memcpy(gReplacementInfo.rpxReplacementInfo.iconCache, defaultIconTexTGA, ICON_SIZE);
                DEBUG_FUNCTION_LINE_ERR("Failed to read iconTex.tga");
            }
@ -204,7 +192,7 @@ RPXLoaderStatus RL_PrepareLaunchFromSD(const char *bundle_path) {
        }
    } else {
        if (!gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted) {
-            memcpy(gReplacementInfo.rpxReplacementInfo.iconCache, defaultIconTexTGA, ICON_SIZE);
+            memset(gReplacementInfo.rpxReplacementInfo.iconCache, 0, sizeof(gReplacementInfo.rpxReplacementInfo.iconCache));
        }
    }
@ -222,21 +210,25 @@ RPXLoaderStatus RL_PrepareLaunchFromSD(const char *bundle_path) {
    strncat(request.path, bundle_path, sizeof(request.path) - 1);
    OSMemoryBarrier();
-    bool success = false;
+
-    MochaUtilsStatus res;
+    int success = false;
-    if ((res = Mocha_PrepareRPXLaunch(&request)) == MOCHA_RESULT_SUCCESS) {
+    int mcpFd   = IOS_Open("/dev/mcp", (IOSOpenMode) 0);
-        success = true;
+    if (mcpFd >= 0) {
-    } else {
+        int out = 0;
-        DEBUG_FUNCTION_LINE_ERR("Failed to prepare rpx launch: %s", Mocha_GetStatusStr(res));
+        IOS_Ioctl(mcpFd, 100, &request, sizeof(request), &out, sizeof(out));
        if (out > 0) {
            success = true;
        }
        IOS_Close(mcpFd);
    }
-    if (!success) {
+    OSMemoryBarrier();
        request.target = LOAD_RPX_TARGET_EXTRA_REVERT_PREPARE;
        Mocha_PrepareRPXLaunch(&request);
    if (!success) {
        gReplacementInfo.rpxReplacementInfo.willRPXBeReplaced = false;
        DEBUG_FUNCTION_LINE_ERR("Failed to load %s on next restart", request.path);
-        return RPX_LOADER_RESULT_UNKNOWN_ERROR;
+        return false;
    } else {
        gReplacementInfo.rpxReplacementInfo.willRPXBeReplaced = true;
    }
@ -261,90 +253,57 @@ RPXLoaderStatus RL_PrepareLaunchFromSD(const char *bundle_path) {
        }
    }
    strncpy(gReplacementInfo.lastFileLoaded, bundle_path, sizeof(gReplacementInfo.lastFileLoaded) - 2);
    OSMemoryBarrier();
-    return RPX_LOADER_RESULT_SUCCESS;
+    return true;
 }
 RPXLoaderStatus RL_LaunchPreparedHomebrew() {
    // Request to launch the homebrew wrapper (H&S or Daily Log)
    auto res = Mocha_LaunchHomebrewWrapper();
    if (res != MOCHA_RESULT_SUCCESS) {
        DEBUG_FUNCTION_LINE_ERR("Launch failed: %s", Mocha_GetStatusStr(res));
    }
    if (res == MOCHA_RESULT_NOT_FOUND) {
        return RPX_LOADER_RESULT_NOT_FOUND;
    } else if (res != MOCHA_RESULT_SUCCESS) {
        return RPX_LOADER_RESULT_UNKNOWN_ERROR;
    }
    return RPX_LOADER_RESULT_SUCCESS;
 }
 RPXLoaderStatus RL_LaunchHomebrew(const char *bundle_path) {
    RPXLoaderStatus res = RPX_LOADER_RESULT_SUCCESS;
    // Tell iosu which .rpx to launch and prepare the content redirection.
    if ((res = RL_PrepareLaunchFromSD(bundle_path)) != RPX_LOADER_RESULT_SUCCESS) {
        return res;
    }
    // Request to launch the homebrew wrapper (H&S or Daily Log)
    if ((res = RL_LaunchPreparedHomebrew()) != RPX_LOADER_RESULT_SUCCESS) {
        // If we fail to launch the correct application, we revert the .rpx redirection.
        MochaRPXLoadInfo loadInfoRevert;
        loadInfoRevert.target = LOAD_RPX_TARGET_EXTRA_REVERT_PREPARE;
        if (MochaUtilsStatus mochaRes = Mocha_PrepareRPXLaunch(&loadInfoRevert); mochaRes != MOCHA_RESULT_SUCCESS) {
            DEBUG_FUNCTION_LINE_WARN("Revert Mocha_PrepareRPXLaunch failed: %s [%d]", Mocha_GetStatusStr(mochaRes), mochaRes);
        }
        return res;
    }
    return res;
 }
 std::mutex mutex;
-RPXLoaderStatus RL_DisableContentRedirection() {
+bool RL_DisableContentRedirection() {
    std::lock_guard<std::mutex> lock(mutex);
    if (contentLayerHandle != 0) {
-        if (ContentRedirection_SetActive(contentLayerHandle, false) != CONTENT_REDIRECTION_RESULT_SUCCESS) {
+        auto res = ContentRedirection_SetActive(contentLayerHandle, false);
-            return RPX_LOADER_RESULT_UNKNOWN_ERROR;
+        if (res != CONTENT_REDIRECTION_RESULT_SUCCESS) {
            return false;
        }
    }
    if (saveLayerHandle != 0) {
-        if (ContentRedirection_SetActive(saveLayerHandle, false) != CONTENT_REDIRECTION_RESULT_SUCCESS) {
+        auto res = ContentRedirection_SetActive(saveLayerHandle, false);
        if (res != CONTENT_REDIRECTION_RESULT_SUCCESS) {
            ContentRedirection_SetActive(contentLayerHandle, true);
-            return RPX_LOADER_RESULT_UNKNOWN_ERROR;
+            return false;
        }
    }
-    return RPX_LOADER_RESULT_SUCCESS;
+    return true;
 }
-RPXLoaderStatus RL_EnableContentRedirection() {
+bool RL_EnableContentRedirection() {
    std::lock_guard<std::mutex> lock(mutex);
    if (contentLayerHandle != 0) {
-        if (ContentRedirection_SetActive(contentLayerHandle, true) != CONTENT_REDIRECTION_RESULT_SUCCESS) {
+        auto res = ContentRedirection_SetActive(contentLayerHandle, true);
-            return RPX_LOADER_RESULT_UNKNOWN_ERROR;
+        if (res != CONTENT_REDIRECTION_RESULT_SUCCESS) {
            return false;
        }
    }
    if (saveLayerHandle != 0) {
-        if (ContentRedirection_SetActive(saveLayerHandle, true) != CONTENT_REDIRECTION_RESULT_SUCCESS) {
+        auto res = ContentRedirection_SetActive(saveLayerHandle, true);
        if (res != CONTENT_REDIRECTION_RESULT_SUCCESS) {
            ContentRedirection_SetActive(contentLayerHandle, false);
-            return RPX_LOADER_RESULT_UNKNOWN_ERROR;
+            return false;
        }
    }
-    return RPX_LOADER_RESULT_SUCCESS;
+    return true;
 }
-RPXLoaderStatus RL_UnmountCurrentRunningBundle() {
+bool RL_UnmountCurrentRunningBundle() {
    std::lock_guard<std::mutex> lock(mutex);
    if (gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted == false) {
-        return RPX_LOADER_RESULT_SUCCESS;
+        return true;
    }
    int outRes = -1;
-    if (ContentRedirection_RemoveDevice(WUHB_ROMFS_PATH, &outRes) == CONTENT_REDIRECTION_RESULT_SUCCESS) {
+    if (ContentRedirection_RemoveDevice(WUHB_ROMFS_NAME, &outRes) == CONTENT_REDIRECTION_RESULT_SUCCESS) {
        if (outRes < 0) {
            DEBUG_FUNCTION_LINE_ERR("RemoveDevice \"%s\" failed for ContentRedirection Module", WUHB_ROMFS_NAME);
            OSFatal("RL_UnmountCurrentRunningBundle: RemoveDevice \"" WUHB_ROMFS_NAME "\" failed for ContentRedirection Module");
@ -354,69 +313,34 @@ RPXLoaderStatus RL_UnmountCurrentRunningBundle() {
        OSFatal("RL_UnmountCurrentRunningBundle: ContentRedirection_RemoveDevice failed");
    }
-    RPXLoaderStatus res = RPX_LOADER_RESULT_SUCCESS;
+    bool res = true;
    if (contentLayerHandle != 0) {
        if (ContentRedirection_RemoveFSLayer(contentLayerHandle) != CONTENT_REDIRECTION_RESULT_SUCCESS) {
-            res = RPX_LOADER_RESULT_UNKNOWN_ERROR;
+            res = false;
        }
        contentLayerHandle = 0;
    }
    if (saveLayerHandle != 0) {
        if (ContentRedirection_RemoveFSLayer(saveLayerHandle) != CONTENT_REDIRECTION_RESULT_SUCCESS) {
-            res = RPX_LOADER_RESULT_UNKNOWN_ERROR;
+            res = false;
        }
        saveLayerHandle = 0;
    }
-    if (romfsUnmount(WUHB_ROMFS_NAME) < 0) {
+    romfsUnmount(WUHB_ROMFS_NAME);
        DEBUG_FUNCTION_LINE_WARN("Failed to unmount romfs \"%s\"", WUHB_ROMFS_NAME);
    }
    gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted = false;
    OSMemoryBarrier();
    return res;
 }
-RPXLoaderStatus RL_GetVersion(RPXLoaderVersion *outVersion) {
+RPXLoaderVersion RL_GetVersion() {
-    if (!outVersion) {
+    return RPX_LOADER_MODULE_VERSION;
        return RPX_LOADER_RESULT_INVALID_ARGUMENT;
    }
    *outVersion = 3;
    return RPX_LOADER_RESULT_SUCCESS;
 }
 RPXLoaderStatus RL_GetPathOfRunningExecutable(char *outBuffer, uint32_t outSize) {
    if (outBuffer == nullptr || outSize == 0) {
        return RPX_LOADER_RESULT_INVALID_ARGUMENT;
    }
    if (strlen(gReplacementInfo.lastFileLoaded) > 0) {
        strncpy(outBuffer, gReplacementInfo.lastFileLoaded, outSize - 1);
        return RPX_LOADER_RESULT_SUCCESS;
    }
    return RPX_LOADER_RESULT_NOT_AVAILABLE;
 }
 RPXLoaderStatus RL_GetPathOfSaveRedirection(char *outBuffer, uint32_t outSize) {
    if (outBuffer == nullptr || outSize == 0) {
        return RPX_LOADER_RESULT_INVALID_ARGUMENT;
    }
    if (saveLayerHandle != 0 && !gActiveSaveRedirectionPath.empty()) {
        strncpy(outBuffer, gActiveSaveRedirectionPath.c_str(), outSize - 1);
        return RPX_LOADER_RESULT_SUCCESS;
    }
    return RPX_LOADER_RESULT_NOT_AVAILABLE;
 }
 WUMS_EXPORT_FUNCTION(RL_PrepareLaunchFromSD);
 WUMS_EXPORT_FUNCTION(RL_LaunchPreparedHomebrew);
 WUMS_EXPORT_FUNCTION(RL_LaunchHomebrew);
 WUMS_EXPORT_FUNCTION(RL_GetVersion);
 WUMS_EXPORT_FUNCTION(RL_LoadFromSDOnNextLaunch);
 WUMS_EXPORT_FUNCTION(RL_EnableContentRedirection);
 WUMS_EXPORT_FUNCTION(RL_DisableContentRedirection);
-WUMS_EXPORT_FUNCTION(RL_UnmountCurrentRunningBundle);
+WUMS_EXPORT_FUNCTION(RL_UnmountCurrentRunningBundle);
 WUMS_EXPORT_FUNCTION(RL_GetPathOfRunningExecutable);
 WUMS_EXPORT_FUNCTION(RL_GetPathOfSaveRedirection);
--- a/src/RPXLoading.h
+++ b/src/RPXLoading.h
@ -2,7 +2,6 @@
 #include <cstdint>
 #include <function_patcher/function_patching.h>
 #include <rpxloader/rpxloader.h>
 #ifdef __cplusplus
 extern "C" {
@ -20,7 +19,7 @@ extern function_replacement_data_t rpx_utils_function_replacements[];
 extern uint32_t rpx_utils_function_replacements_size;
 void RPXLoadingCleanUp();
-RPXLoaderStatus RL_UnmountCurrentRunningBundle();
+bool RL_UnmountCurrentRunningBundle();
 #ifdef __cplusplus
 }
--- a/src/contentredirection.def
+++ b/src/contentredirection.def
@ -0,0 +1,4 @@
 :NAME homebrew_content_redirection
 :TEXT
 CRGetVersion
--- a/src/data/defaultIcon.c
+++ b/src/data/defaultIcon.c
--- a/src/data/defaultIcon.h
+++ b/src/data/defaultIcon.h
@ -1,3 +0,0 @@
 #include <stdint.h>
 extern uint8_t defaultIconTexTGA[];
--- a/src/globals.cpp
+++ b/src/globals.cpp
@ -1,6 +1,5 @@
-#include "globals.h"
+#include "globals.h"
-
+
-RPXLoader_ReplacementInformation gReplacementInfo = {};
+RPXLoader_ReplacementInformation gReplacementInfo __attribute__((section(".data")));
-CRLayerHandle contentLayerHandle                  = 0;
+CRLayerHandle contentLayerHandle __attribute__((section(".data"))) = 0;
-CRLayerHandle saveLayerHandle                     = 0;
+CRLayerHandle saveLayerHandle __attribute__((section(".data")))    = 0;
 std::string gActiveSaveRedirectionPath;
--- a/src/globals.h
+++ b/src/globals.h
@ -47,11 +47,9 @@ typedef struct RPXLoader_ReplacementInformation_t {
    RPXReplacementInfo rpxReplacementInfo;
    ContentReplacementInfo contentReplacementInfo;
    ContentReplacementWithFallback contentReplacementWithFallbackInfo;
    char lastFileLoaded[0x280];
 } RPXLoader_ReplacementInformation;
 extern RPXLoader_ReplacementInformation gReplacementInfo;
 extern CRLayerHandle contentLayerHandle;
-extern CRLayerHandle saveLayerHandle;
+extern CRLayerHandle saveLayerHandle;
 extern std::string gActiveSaveRedirectionPath;
--- a/src/main.cpp
+++ b/src/main.cpp
@ -3,12 +3,10 @@
 #include "globals.h"
 #include "utils/StringTools.h"
 #include "utils/logger.h"
 #include "version.h"
 #include <content_redirection/redirection.h>
 #include <coreinit/cache.h>
 #include <coreinit/debug.h>
 #include <coreinit/title.h>
 #include <mocha/mocha.h>
 #include <nn/act.h>
 #include <romfs_dev.h>
 #include <string>
@ -16,52 +14,40 @@
 #include <wuhb_utils/utils.h>
 #include <wums.h>
 #define VERSION "v0.3.4"
 WUMS_MODULE_EXPORT_NAME("homebrew_rpx_loader");
 WUMS_USE_WUT_DEVOPTAB();
-WUMS_DEPENDS_ON(homebrew_content_redirection);
+extern "C" bool CRGetVersion();
-WUMS_DEPENDS_ON(homebrew_wuhb_utils);
+extern "C" bool WUU_GetVersion();
 WUMS_DEPENDS_ON(homebrew_functionpatcher);
 WUMS_INITIALIZE() {
    initLogging();
    if (FunctionPatcher_InitLibrary() != FUNCTION_PATCHER_RESULT_SUCCESS) {
        OSFatal("homebrew_rpx_loader: FunctionPatcher_InitLibrary failed");
    }
    DEBUG_FUNCTION_LINE("Patch functions");
-    for (uint32_t i = 0; i < rpx_utils_function_replacements_size; i++) {
+    // we only patch static functions, we don't need re-patch them at every launch
-        bool wasPatched = false;
+    FunctionPatcherPatchFunction(rpx_utils_function_replacements, rpx_utils_function_replacements_size);
        if (FunctionPatcher_AddFunctionPatch(&rpx_utils_function_replacements[i], nullptr, &wasPatched) != FUNCTION_PATCHER_RESULT_SUCCESS || !wasPatched) {
            OSFatal("homebrew_rpx_loader: Failed to patch function");
        }
    }
    DEBUG_FUNCTION_LINE("Patch functions finished");
    gReplacementInfo = {};
    // Call this function to make sure the Content Redirection will be loaded before this module is module.
    CRGetVersion();
    // Call this function to make sure the WUHBUtils will be loaded before this module is module.
    WUU_GetVersion();
    // But then use libcontentredirection instead.
    ContentRedirectionStatus error;
-    if ((error = ContentRedirection_InitLibrary()) != CONTENT_REDIRECTION_RESULT_SUCCESS) {
+    if ((error = ContentRedirection_Init()) != CONTENT_REDIRECTION_RESULT_SUCCESS) {
        DEBUG_FUNCTION_LINE_ERR("Failed to init ContentRedirection. Error %d", error);
        OSFatal("Failed to init ContentRedirection.");
    }
    // But then use libwuhbutils instead.
    WUHBUtilsStatus error2;
-    if ((error2 = WUHBUtils_InitLibrary()) != WUHB_UTILS_RESULT_SUCCESS) {
+    if ((error2 = WUHBUtils_Init()) != WUHB_UTILS_RESULT_SUCCESS) {
-        DEBUG_FUNCTION_LINE_ERR("Failed to init WUHBUtils. Error %d", error2);
+        DEBUG_FUNCTION_LINE_ERR("RPXLoadingModule: Failed to init WUHBUtils. Error %d", error2);
        OSFatal("Failed to init WUHBUtils.");
    }
    // Init libmocha
    MochaUtilsStatus error3;
    if ((error3 = Mocha_InitLibrary()) != MOCHA_RESULT_SUCCESS) {
        DEBUG_FUNCTION_LINE_ERR("Failed to init libmocha. Error %s", Mocha_GetStatusStr(error3));
        OSFatal("Failed to init libmocha. Make sure to use the latest version of MochaPayload");
    }
    deinitLogging();
 }
@ -80,36 +66,23 @@ WUMS_APPLICATION_STARTS() {
    if (upid != 2 && upid != 15) {
        return;
    }
    OSReport("Running RPXLoadingModule " VERSION VERSION_EXTRA "\n");
    initLogging();
    if (gReplacementInfo.rpxReplacementInfo.willRPXBeReplaced) {
        gReplacementInfo.rpxReplacementInfo.willRPXBeReplaced = false;
        gReplacementInfo.rpxReplacementInfo.isRPXReplaced     = true;
    }
    if (_SYSGetSystemApplicationTitleId(SYSTEM_APP_ID_HEALTH_AND_SAFETY) != OSGetTitleID()) {
        gReplacementInfo.lastFileLoaded[0] = '\0';
    }
    gActiveSaveRedirectionPath.clear();
    if (_SYSGetSystemApplicationTitleId(SYSTEM_APP_ID_HEALTH_AND_SAFETY) == OSGetTitleID() &&
        strlen(gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath) > 0) {
-        uint32_t currentHash           = StringTools::hash(gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath);
+        uint32_t currentHash = StringTools::hash(gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath);
        std::string shortNameSanitized = sanitizeName(gReplacementInfo.rpxReplacementInfo.metaInformation.shortname);
        nn::act::Initialize();
        nn::act::PersistentId persistentId = nn::act::GetPersistentId();
        nn::act::Finalize();
-        std::string relativePath = string_format("wiiu/apps/save/%08X", currentHash);
+        std::string basePath = string_format("/vol/external01/wiiu/apps/save/%08X", currentHash);
-        if (!shortNameSanitized.empty()) {
+        std::string common   = string_format("fs:/vol/external01/wiiu/apps/save/%08X/common", currentHash);
-            relativePath += string_format(" (%s)", shortNameSanitized.c_str());
+        std::string user     = string_format("fs:/vol/external01/wiiu/apps/save/%08X/%08X", currentHash, 0x80000000 | persistentId);
        }
        std::string basePath = "fs:/vol/external01/" + relativePath;
        std::string common = basePath + "/common";
        std::string user   = basePath + string_format("/%08X", 0x80000000 | persistentId);
        CreateSubfolder(common.c_str());
        CreateSubfolder(user.c_str());
@ -148,8 +121,6 @@ WUMS_APPLICATION_STARTS() {
                    gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted      = true;
                    gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath[0] = '\0';
                    gActiveSaveRedirectionPath = relativePath;
                    OSMemoryBarrier();
                    return;
                } else {
--- a/src/utils/FileReader.h
+++ b/src/utils/FileReader.h
@ -17,10 +17,6 @@ public:
    virtual int64_t read(uint8_t *buffer, uint32_t size);
    uint32_t getHandle() {
        return (uint32_t) this;
    }
 private:
    bool isReadFromBuffer = false;
    uint8_t *input_buffer = nullptr;
--- a/src/utils/StringTools.h
+++ b/src/utils/StringTools.h
@ -1,7 +1,6 @@
 #pragma once
 #include "logger.h"
 #include "utils.h"
 #include <memory>
 #include <string>
 #include <vector>
@ -11,12 +10,7 @@ template<typename... Args>
 std::string string_format(const std::string &format, Args... args) {
    int size_s = std::snprintf(nullptr, 0, format.c_str(), args...) + 1; // Extra space for '\0'
    auto size  = static_cast<size_t>(size_s);
-    auto buf   = make_unique_nothrow<char[]>(size);
+    auto buf   = std::make_unique<char[]>(size);
    if (!buf) {
        DEBUG_FUNCTION_LINE_ERR("string_format failed, not enough memory");
        OSFatal("string_format failed, not enough memory");
        return std::string("");
    }
    std::snprintf(buf.get(), size, format.c_str(), args...);
    return std::string(buf.get(), buf.get() + size - 1); // We don't want the '\0' inside
 }
--- a/src/utils/logger.h
+++ b/src/utils/logger.h
@ -8,34 +8,34 @@
 extern "C" {
 #endif
-#define LOG_APP_TYPE                "M"
+#define __FILENAME_X__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__)
-#define LOG_APP_NAME                "rpxloading"
+#define __FILENAME__   (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILENAME_X__)
 #define __FILENAME_X__              (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__)
 #define __FILENAME__                (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILENAME_X__)
 #define LOG(LOG_FUNC, FMT, ARGS...) LOG_EX(LOG_FUNC, "", "", FMT, ##ARGS)
 #define LOG_EX(LOG_FUNC, LOG_LEVEL, LINE_END, FMT, ARGS...)                                                                                              \
    do {                                                                                                                                                 \
        LOG_FUNC("[(%s)%18s][%23s]%30s@L%04d: " LOG_LEVEL "" FMT "" LINE_END, LOG_APP_TYPE, LOG_APP_NAME, __FILENAME__, __FUNCTION__, __LINE__, ##ARGS); \
    } while (0)
 #ifdef DEBUG
 #ifdef VERBOSE_DEBUG
-#define DEBUG_FUNCTION_LINE_VERBOSE(FMT, ARGS...) LOG(WHBLogPrintf, FMT, ##ARGS)
+#define DEBUG_FUNCTION_LINE_VERBOSE(FMT, ARGS...)                                                \
    do {                                                                                         \
        WHBLogPrintf("[%23s]%30s@L%04d: " FMT "", __FILENAME__, __FUNCTION__, __LINE__, ##ARGS); \
    } while (0)
 #else
 #define DEBUG_FUNCTION_LINE_VERBOSE(FMT, ARGS...) while (0)
 #endif
-#define DEBUG_FUNCTION_LINE(FMT, ARGS...)       LOG(WHBLogPrintf, FMT, ##ARGS)
+#define DEBUG_FUNCTION_LINE(FMT, ARGS...)                                                        \
    do {                                                                                         \
        WHBLogPrintf("[%23s]%30s@L%04d: " FMT "", __FILENAME__, __FUNCTION__, __LINE__, ##ARGS); \
    } while (0)
-#define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...) LOG(WHBLogWritef, FMT, ##ARGS)
+#define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...)                                                  \
    do {                                                                                         \
        WHBLogWritef("[%23s]%30s@L%04d: " FMT "", __FILENAME__, __FUNCTION__, __LINE__, ##ARGS); \
    } while (0)
-#define DEBUG_FUNCTION_LINE_ERR(FMT, ARGS...)   LOG_EX(WHBLogPrintf, "##ERROR## ", "", FMT, ##ARGS)
+#define DEBUG_FUNCTION_LINE_ERR(FMT, ARGS...)                                                                \
-
+    do {                                                                                                     \
-#define DEBUG_FUNCTION_LINE_WARN(FMT, ARGS...)  LOG_EX(WHBLogPrintf, "##WARN ## ", "", FMT, ##ARGS)
+        WHBLogPrintf("[%23s]%30s@L%04d: ##ERROR## " FMT "\n", __FILENAME__, __FUNCTION__, __LINE__, ##ARGS); \
    } while (0)
 #else
@ -45,9 +45,10 @@ extern "C" {
 #define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...)   while (0)
-#define DEBUG_FUNCTION_LINE_ERR(FMT, ARGS...)     LOG_EX(OSReport, "##ERROR## ", "\n", FMT, ##ARGS)
+#define DEBUG_FUNCTION_LINE_ERR(FMT, ARGS...)                                                            \
-
+    do {                                                                                                 \
-#define DEBUG_FUNCTION_LINE_WARN(FMT, ARGS...)    LOG_EX(OSReport, "##WARN ## ", "\n", FMT, ##ARGS)
+        OSReport("[%23s]%30s@L%04d: ##ERROR## " FMT "\n", __FILENAME__, __FUNCTION__, __LINE__, ##ARGS); \
    } while (0)
 #endif
--- a/src/utils/utils.cpp
+++ b/src/utils/utils.cpp
@ -1,41 +1,9 @@
 #include "utils/logger.h"
 #include <string.h>
 #include <string>
 #include <whb/log.h>
 std::string sanitizeName(const std::string &input) {
    if (input.empty() || input.starts_with(' ')) {
        return "";
    }
    std::string result       = input;
    std::string illegalChars = "\\/:?\"<>|@=;`_^][";
    for (auto it = result.begin(); it < result.end(); ++it) {
        if (*it < '0' || *it > 'z') {
            *it = ' ';
        }
    }
    for (auto it = result.begin(); it < result.end(); ++it) {
        bool found = illegalChars.find(*it) != std::string::npos;
        if (found) {
            *it = ' ';
        }
    }
    uint32_t length = result.length();
    for (uint32_t i = 1; i < length; ++i) {
        if (result[i - 1] == ' ' && result[i] == ' ') {
            result.erase(i, 1);
            i--;
            length--;
        }
    }
    if (result.size() == 1 && result[0] == ' ') {
        result.clear();
    }
    return result;
 }
 #define PRINTF_BUFFER_LENGTH 2048
 // https://gist.github.com/ccbrown/9722406
 void dumpHex(const void *data, size_t size) {
    char ascii[17];
--- a/src/utils/utils.h
+++ b/src/utils/utils.h
@ -1,42 +1,38 @@
 #pragma once
 #include <cstdint>
 #include <forward_list>
 #include <malloc.h>
 #include <memory>
 #include <mutex>
-template<class T, class... Args>
+#ifdef __cplusplus
-std::unique_ptr<T> make_unique_nothrow(Args &&...args) noexcept(noexcept(T(std::forward<Args>(args)...))) {
+extern "C" {
-    return std::unique_ptr<T>(new (std::nothrow) T(std::forward<Args>(args)...));
+#endif
 }
-template<typename T>
+#define LIMIT(x, min, max)                                   \
-inline typename std::unique_ptr<T> make_unique_nothrow(size_t num) noexcept {
+    ({                                                       \
-    return std::unique_ptr<T>(new (std::nothrow) std::remove_extent_t<T>[num]());
+        typeof(x) _x     = x;                                \
-}
+        typeof(min) _min = min;                              \
        typeof(max) _max = max;                              \
        (((_x) < (_min)) ? (_min) : ((_x) > (_max)) ? (_max) \
                                                    : (_x)); \
    })
-template<class T, class... Args>
+#define DegToRad(a)           ((a) *0.01745329252f)
-std::shared_ptr<T> make_shared_nothrow(Args &&...args) noexcept(noexcept(T(std::forward<Args>(args)...))) {
+#define RadToDeg(a)           ((a) *57.29577951f)
    return std::shared_ptr<T>(new (std::nothrow) T(std::forward<Args>(args)...));
 }
-template<typename T, class Allocator, class Predicate>
+#define ALIGN4(x)             (((x) + 3) & ~3)
-bool remove_locked_first_if(std::mutex &mutex, std::forward_list<T, Allocator> &list, Predicate pred) {
+#define ALIGN32(x)            (((x) + 31) & ~31)
    std::lock_guard<std::mutex> lock(mutex);
    auto oit = list.before_begin(), it = std::next(oit);
    while (it != list.end()) {
        if (pred(*it)) {
            list.erase_after(oit);
            return true;
        }
        oit = it++;
    }
    return false;
 }
 std::string sanitizeName(const std::string &input);
 // those work only in powers of 2
 #define ROUNDDOWN(val, align) ((val) & ~(align - 1))
-#define ROUNDUP(val, align)   ROUNDDOWN(((val) + (align - 1)), align)
+#define ROUNDUP(val, align)   ROUNDDOWN(((val) + (align - 1)), align)
 #define le16(i)               ((((uint16_t) ((i) &0xFF)) << 8) | ((uint16_t) (((i) &0xFF00) >> 8)))
 #define le32(i)               ((((uint32_t) le16((i) &0xFFFF)) << 16) | ((uint32_t) le16(((i) &0xFFFF0000) >> 16)))
 #define le64(i)               ((((uint64_t) le32((i) &0xFFFFFFFFLL)) << 32) | ((uint64_t) le32(((i) &0xFFFFFFFF00000000LL) >> 32)))
 //Needs to have log_init() called beforehand.
 void dumpHex(const void *data, size_t size);
 #ifdef __cplusplus
 }
 #endif
--- a/src/version.h
+++ b/src/version.h
@ -1,2 +0,0 @@
 #pragma once
 #define VERSION_EXTRA ""
--- a/src/wuhbutils.def
+++ b/src/wuhbutils.def
@ -0,0 +1,4 @@
 :NAME homebrew_wuhb_utils
 :TEXT
 WUU_GetVersion
		`@ -1,3 +0,0 @@`
			`#include <stdint.h>`

			`extern uint8_t defaultIconTexTGA[];`