Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: wiidev/usbloadergx
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: enhanced
Choose a base ref
...
head repository: Jacoby6000/usbloadergx
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: enhanced
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 18 commits
  • 6 files changed
  • 2 contributors

Commits on Mar 19, 2024

  1. Update sjis.cpp

    V0rt3x667 authored Mar 19, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    d7f0b46 View commit details

Commits on Jul 23, 2024

  1. Check index 9

    Jacoby6000 committed Jul 23, 2024
    Copy the full SHA
    eff4f10 View commit details
  2. Copy the full SHA
    b0dd7e8 View commit details
  3. Revert "Update sjis.cpp"

    This reverts commit d7f0b46.
    Jacoby6000 committed Jul 23, 2024
    Copy the full SHA
    d5abde3 View commit details
  4. Copy the full SHA
    e77a742 View commit details
  5. Copy the full SHA
    55b61ac View commit details
  6. spaces -> tabs

    Jacoby6000 committed Jul 23, 2024
    Copy the full SHA
    0b6c15c View commit details
  7. Copy the full SHA
    d3a2b42 View commit details
  8. more spaces -> tabs

    Jacoby6000 committed Jul 23, 2024
    Copy the full SHA
    ba630e2 View commit details
  9. Copy the full SHA
    629abb4 View commit details

Commits on Jul 24, 2024

  1. add /output to gitignore

    Jacoby6000 committed Jul 24, 2024
    Copy the full SHA
    7d3bda3 View commit details
  2. Update build

    Jacoby6000 committed Jul 24, 2024
    Copy the full SHA
    3c185fc View commit details
  3. Copy the full SHA
    c1358ba View commit details
  4. Revert "update build file to cache devkit pro packages"

    This reverts commit c1358ba.
    Jacoby6000 committed Jul 24, 2024
    Copy the full SHA
    2fab76a View commit details
  5. Copy the full SHA
    31be7f8 View commit details
  6. bump revision

    Jacoby6000 committed Jul 24, 2024
    Copy the full SHA
    9100570 View commit details
  7. add me to the credits

    Jacoby6000 committed Jul 24, 2024
    Copy the full SHA
    f6fdf3a View commit details
  8. more build refinements

    Jacoby6000 committed Jul 24, 2024
    Copy the full SHA
    a988b90 View commit details
Showing with 38 additions and 13 deletions.
  1. +1 −0 .gitignore
  2. +5 −3 Dockerfile
  3. +18 −5 Makefile
  4. +11 −2 source/SystemMenu/SystemMenuResources.cpp
  5. +2 −2 svnrev.sh
  6. +1 −1 version.txt
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -11,3 +11,4 @@ usbloader_gx/
/source/svnrev.c
/usbloader_gx.zip
/wiiload
/output
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
FROM debian:buster as usbloader
ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London"
RUN apt-get update -y && apt-get install -y \
xz-utils make git
xz-utils make git zip

ADD https://wii.leseratte10.de/devkitPro/file.php/devkitPPC-r41-2-linux_x86_64.pkg.tar.xz /
ADD https://wii.leseratte10.de/devkitPro/file.php/libogc-2.3.1-1-any.pkg.tar.xz /
@@ -31,9 +31,11 @@ ENV DEVKITPPC=/devkitpro/devkitPPC
# Now we have a container that has the dev environment set up.
# Copy current folder into container, then compile
COPY . /projectroot/
RUN cd /projectroot && make
RUN cd /projectroot && make clean && make -j8 dist


# Copy the DOL and ELF out of the container
FROM scratch AS export-stage
COPY --from=usbloader /projectroot/boot.* /
COPY --from=usbloader /projectroot/boot.* /
COPY --from=usbloader /projectroot/usbloader_gx /
COPY --from=usbloader /projectroot/usbloadergx_r*.zip /
23 changes: 18 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -177,13 +177,26 @@ clean:
@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol usbloader_gx.zip usbloader_gx

#---------------------------------------------------------------------------------
deploy:
package:
$(MAKE)
@echo Packaging...
@[ -d $(PROJECTDIR)/usbloader_gx ] || mkdir -p $(PROJECTDIR)/usbloader_gx
@cp $(TARGET).dol $(PROJECTDIR)/usbloader_gx/
@cp $(PROJECTDIR)/HBC/icon.png $(PROJECTDIR)/usbloader_gx/
@cp $(PROJECTDIR)/HBC/meta.xml $(PROJECTDIR)/usbloader_gx/

#---------------------------------------------------------------------------------
dist:
$(MAKE) package
@mkdir -p $(PROJECTDIR)/dist/apps
@cp -r $(PROJECTDIR)/usbloader_gx $(PROJECTDIR)/dist/apps/
@cd $(PROJECTDIR)/dist && zip "../usbloadergx_r`cat $(PROJECTDIR)/version.txt`" -r .

#---------------------------------------------------------------------------------

deploy:
$(MAKE) package
@echo Deploying...
@[ -d usbloader_gx ] || mkdir -p usbloader_gx
@cp $(TARGET).dol usbloader_gx/
@cp HBC/icon.png usbloader_gx/
@cp HBC/meta.xml usbloader_gx/
@zip usbloader_gx.zip usbloader_gx/*
wiiload usbloader_gx.zip

13 changes: 11 additions & 2 deletions source/SystemMenu/SystemMenuResources.cpp
Original file line number Diff line number Diff line change
@@ -56,22 +56,31 @@ bool SystemMenuResources::Init()
// determine resource cid
u16 idx = 0xffff;
tmd_content *contents = TMD_CONTENTS( p_tmd );

// Priiloader moves some system resources that we rely on from index 1 to index 9.
// In doing this it creates a 10th index (9) to contain the moved resources.
// If priiloader is installed, we need to look for content at index 9 instead of index 1.
bool hasVWiiPriiloader = p_tmd->num_contents == 10;
u16 targetIndex = hasVWiiPriiloader ? 9 : 1;

for( u16 i = 0; i < p_tmd->num_contents; i++ )
{
if( contents[ i ].index == 1 )
if( contents[ i ].index == targetIndex )
{
idx = i;
break;
}
}

if( idx == 0xffff )
{
gprintf( "SM main resource not found\n" );
return false;
}

// build file path
char path[ ISFS_MAXPATH ]__attribute__((aligned( 32 )));
sprintf( path, "/title/00000001/00000002/content/%08x.app", (unsigned int)contents[ idx ].cid );
sprintf(path, "/title/00000001/00000002/content/%08x.app", (unsigned int)contents[ idx ].cid);

// get resource archive
u8* resourceArc = NULL;
4 changes: 2 additions & 2 deletions svnrev.sh
Original file line number Diff line number Diff line change
@@ -63,8 +63,8 @@ The interactive GUI is completely controllable with WiiMote, Classic Controller
Features are automatic widescreen detection, coverdownload, parental control, theme support and many more.
Credits:
Coding: Cyan, Dimok, blackb0x, nIxx, giantpune, ardi, Hungyip84, DrayX7, Lustar, r-win, WiiShizzza
Artwork: cyrex, NeoRame
Coding: Cyan, Dimok, blackb0x, nIxx, giantpune, ardi, Hungyip84, DrayX7, Lustar, r-win, WiiShizzza, Jacoby6000
Artwork: cyrex, NeoRame
Validation: Cyan and many others
Issue management: Cyan
GameTDB / Covers: Lustar
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1281
1282