Gameblabla fork updates

.gitignore

@@ -1,3 +1,5 @@
+## Build folder
+/build/*
 ## Build files
 *.v64
 *.elf

Makefile

@@ -19,15 +19,15 @@ OBJDIR = ./obj
 BINDIR = ./bin
 TOOLSDIR = ./tools
 
-LINK_FLAGS = -O1 -L$(ROOTDIR)/lib -L$(ROOTDIR)/mips64-elf/lib -ldragon -lmikmod -lmad -lyaml -lc -lm -ldragonsys -lnosys $(LIBS) -Tn64ld.x
-PROG_NAME = OS64
-CFLAGS = -std=gnu99 -march=vr4300 -mtune=vr4300 -O1 -I$(INCDIR) -I$(ROOTDIR)/include -I$(ROOTDIR)/mips64-elf/include -lpthread -lrt -D_REENTRANT -DUSE_TRUETYPE $(SET_DEBUG)
+LINK_FLAGS = -O3 -L$(ROOTDIR)/lib -L$(ROOTDIR)/mips64-elf/lib -ldragon -lmad -lmikmod -lyaml -lc -lm -ldragonsys -lnosys $(LIBS) -Tn64ld.x
+PROG_NAME = OS64P
+CFLAGS = -std=gnu99 -march=vr4300 -mtune=vr4300 -O3 -I$(INCDIR) -I$(ROOTDIR)/include -I$(ROOTDIR)/mips64-elf/include -lpthread -lrt -D_REENTRANT -DUSE_TRUETYPE $(SET_DEBUG)
 ASFLAGS = -mtune=vr4300 -march=vr4300
 CC = $(GCCN64PREFIX)gcc
 AS = $(GCCN64PREFIX)as
 LD = $(GCCN64PREFIX)ld
 OBJCOPY = $(GCCN64PREFIX)objcopy
-  
+
 SOURCES := $(wildcard $(SRCDIR)/*.c)
 OBJECTS = $(SOURCES:$(SRCDIR)/%.c=$(OBJDIR)/%.o)
 

README.md

@@ -2,76 +2,33 @@
 
 Alternative Everdrive64 menu
 
-
-`Altra64` is an open source menu for [Everdrive64](http://krikzz.com/) and is based on a fork of alt64 which was
+`Altra64` is an open source menu for [Everdrive64](http://krikzz.com/) and ed64+ and is based on a fork of alt64 which was
 originally written by saturnu, and released on the
 [Everdrive64 forum](http://krikzz.com/forum/index.php?topic=816.0).
 
 ## Building
 
-If you want to build the menu, you need an n64 toolchain. When using windows 10 or Ubuntu, installation is totally automated through a script.
-
-### Dependencies (installed automatically)
-* Windows 10 (Aniversary Update or above) / Ubuntu 16.04 (or above)
-* [libdragon](https://github.com/DragonMinded/libdragon)
-* [libmikmod (with n64 driver)](https://github.com/networkfusion/libmikmod)
-* [libmad-n64](https://github.com/networkfusion/libmad-n64)
-* [libyaml](http://pyyaml.org/wiki/LibYAML)
-
-### Build the Toolchain
-
-*You may skip this step if it's already installed.*
-
-Clone this `Altra64` repo to a directory of your choice.
-
-On Windows 10:
-* Ensure that ["Windows Subsystem For Linux (Ubuntu)"](https://msdn.microsoft.com/en-gb/commandline/wsl/install_guide) is installed.
-* browse to the tools directory and double click on ```setup-wsfl.cmd```.
-
-On Ubuntu, browse to the tools directory and run the command ```$ chmod +x ./setup-linux.sh;source ./setup-linux.sh```
+If you want to build the menu, you need an n64 toolchain. This is terrible to build, moparisthebest ended up creating a Dockerfile in the docker folder, instructions included in it.
 
+Or if you trust him, you can use the one he built and pushed to docker hub, [moparisthebest/altra64-dev](https://hub.docker.com/r/moparisthebest/altra64-dev)
 
 ### Build `Altra64`
 
 To build the Rom
 
-from the projects root directory,
-On Windows 10 run 
-```
-> build
-```
-on linux
-```
-$ make
-```
-If it all worked, you will find `OS64.v64` in the `Altra64` bin directory.
-
-### Debug Build `Altra64`
-To build the debug version of the Rom
-
-from the projects root directory,
-On Windows 10 run 
-```
-> build debug
-```
-on linux
-```
-$ make debug
-```
-If it all worked, you will find `OS64.v64` in the `Altra64` bin directory.
+from the projects root directory, with docker installed
+
+$ docker run --rm -v "$(pwd):/build" moparisthebest/altra64-dev make
+
+If it all worked, you will find `OS64.v64` in the `bin` directory.
 
 
 ### Clean `Altra64`
+
 Finally, we can clean the build objects from the project
 
-from the projects root directory,
-On Windows 10 run 
-```
-> build clean
-```
-on linux
-```
-$ make clean
-```
+from the projects root directory
+
+$ docker run --rm -v "$(pwd):/build" moparisthebest/altra64-dev make clean
 
 Enjoy!

docker/Dockerfile

@@ -0,0 +1,25 @@
+
+# to build and test:
+# docker build -t altra64-dev . && docker run --rm -v "$(pwd):/build" -it altra64-dev
+
+# to use to compile altra64 (or other n64 stuff I guess)
+# docker run --rm -v "$(pwd):/build" altra64-dev make
+
+#FROM ubuntu:18.04
+FROM ubuntu:16.04
+
+RUN mkdir /build
+
+COPY setup-linux.sh /usr/bin/setup-linux.sh
+
+# run it then delete all build artifacts
+RUN /usr/bin/setup-linux.sh && rm -rf /root/*
+
+ENV N64_INST=/usr/local/libdragon
+ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/libdragon/bin
+
+VOLUME [ "/build" ]
+
+WORKDIR /build
+
+CMD ["bash"]

docker/setup-linux.sh

@@ -0,0 +1,93 @@
+#!/bin/bash
+#
+# Copyright (c) 2017 The Altra64 project contributors
+# See LICENSE file in the project root for full license information.
+#
+
+set -euxo pipefail
+
+# Download and install latest updates for the system [sudo req.]
+apt-get update
+apt-get -y upgrade
+
+# Install essential packages [sudo req.]
+apt-get -y install wget build-essential git texinfo libc6 libgmp-dev libmpfr-dev libmpc-dev libpng-dev zlib1g-dev libtool autoconf
+
+# change to the users root directory
+cd ~/
+
+# add a system variable and make it perminent
+# echo 'N64_INST=/usr/local/libdragon' >> /etc/environment
+# echo 'export N64_INST=/usr/local/libdragon' >> ~/.bashrc
+export N64_INST=/usr/local/libdragon
+# source ~/.bashrc
+
+# Pull the latest libdragon source code and make a build directory
+git clone https://github.com/dragonminded/libdragon.git
+# set to correct commit
+
+# fix issues with the build scripts
+sed -i -- 's|${N64_INST:-/usr/local}|/usr/local/libdragon|g' libdragon/tools/build
+sed -i -- 's|--with-newlib|--with-newlib --with-system-zlib|g' libdragon/tools/build
+
+sed -i -- 's| -lpng|\nLDLIBS = -lpng|g' libdragon/tools/mksprite/Makefile
+sed -i -- 's| -Werror| -w|g' libdragon/tools/mksprite/Makefile
+
+# make a build folder for libdragon
+mkdir libdragon/build_gcc
+cp libdragon/tools/build-toolchain.sh libdragon/build/build-toolchain.sh
+
+# run the build script (this will take a while! and if not sudo, will ask for password mid flow!)
+cd libdragon/build
+./build-toolchain.sh
+
+cd ..
+# run the install script [sudo req]
+make
+make install
+make tools
+make tools-install
+
+cd ..
+# install libmikmod (custom version)
+git clone https://github.com/n64-tools/libmikmod
+cd libmikmod/n64
+make
+make install
+cd .. # we have are in a subfolder, this is not a duplicate...
+
+cd ..
+# install libyaml
+git clone https://github.com/yaml/libyaml
+cd libyaml
+./bootstrap
+#$(N64_INST) converterd to $N64_INST below otherwise it will not run on WSFL
+export PATH=$PATH:$N64_INST/bin
+CFLAGS="-std=gnu99 -march=vr4300 -mtune=vr4300" \
+LDFLAGS="-L$N64_INST/lib -Tn64ld.x" \
+LIBS="-ldragon -lc -ldragonsys -lnosys" \
+./configure --host=mips64-elf --prefix=$N64_INST
+make
+make install
+
+cd ..
+# install libmad (custom version)
+git clone https://github.com/n64-tools/libmad
+cd libmad
+export PATH=$PATH:$N64_INST/bin
+CFLAGS="-std=gnu99 -march=vr4300 -mtune=vr4300" \
+LDFLAGS="-L$N64_INST/lib -Tn64ld.x" \
+LIBS="-ldragon -lc -ldragonsys -lnosys" \
+./configure --host=mips64-elf --prefix=$N64_INST
+make
+make install
+
+cd ..
+
+# Perform cleanup
+apt-get -y autoremove
+apt-get autoclean
+
+echo 'export N64_INST=/usr/local/libdragon' >> ~/.bashrc
+echo 'export PATH="$PATH:$N64_INST/bin"' >> ~/.bashrc
+

inc/menu.h

@@ -11,5 +11,7 @@ extern int text_offset;
 void printText(char *msg, int x, int y, display_context_t dcon);
 
 void menu_about(display_context_t disp);
+void menu_controls(display_context_t disp);
+void menu_delete(display_context_t disp, bool isdir);
 
 #endif

inc/rom.h

@@ -129,7 +129,7 @@
 #define	IO_WRITE(addr,data)	(*(volatile u32*)PHYS_TO_K1(addr)=(u32)(data))
 
 #define SAVE_SIZE_SRAM 		32768
-#define SAVE_SIZE_SRAM96 	131072
+#define SAVE_SIZE_SRAM96 	131072 //TODO: or should this be 98304
 #define SAVE_SIZE_EEP4k 	512
 #define SAVE_SIZE_EEP16k 	2048
 #define SAVE_SIZE_FLASH 	131072

res/ALT64.INI

@@ -1,32 +1,29 @@
 ; alt64 config file
 
-[ed64]                          ; Menu config
-build=18                        ; Release build number
-border_color_1=FFFFFFFF         ; 0x00000080 RGBT
-border_color_2=3F3F3FFF         ; 0x3F3F3FFF RGBT 00000060 w light
-box_color=000000B6              ; 0x00000080 RGBT
-selection_color=80008070        ; 0x80008070 RGBT 6495ED60
-list_font_color=CDC9C940        ; 0x80008070 RGBT 6495ED60
-list_dir_font_color=FFFFE040    ; 0x80008070 RGBT 6495ED60
-selection_font_color=FFB90FFF   ; 0x80008070 RGBT 6495ED60
-text_offset=0                   ; shift menu horizontal e.g. -1
-cd_behaviour=1                  ; 0=first entry 1=last entry
-scroll_behaviour=0              ; 0=page-system 1=classic
-quick_boot=1                    ; 'START' boots last rom
-sound_on=1                      ; sounds 1=on 0=off
-page_display=1                  ; display page
-tv_mode=2                       ; 1=ntsc 2=pal 3=mpal 0=force_off
-enable_colored_list=1           ; 1=enable 0=disalbe
-ext_type=0                      ; 0=classic 1=OS64
-sd_speed=2                      ; 1=25MHz 2=50MHz
-background_image=background.png	; backgrund png image 320x240 32bit
-hide_sysfolder=1                ; 1=hide 0=don't hide
-mempak_path=/MEMPAKS/           ; surround with slashes
-save_path=SDSAVE                ; save directory inside ED64
+[ed64]                          	; Menu config
+build=20                        	; Release build number
+border_color_1=FFFFFFFF         	; 0x00000080 RGBT
+border_color_2=3F3F3FFF         	; 0x3F3F3FFF RGBT 00000060 w light
+box_color=000000B6              	; 0x00000080 RGBT
+selection_color=80008070        	; 0x80008070 RGBT 6495ED60
+list_font_color=CDC9C940        	; 0x80008070 RGBT 6495ED60
+list_dir_font_color=FFFFE040    	; 0x80008070 RGBT 6495ED60
+selection_font_color=FFB90FFF   	; 0x80008070 RGBT 6495ED60
+text_offset=0                   	; shift menu horizontal e.g. -1
+cd_behaviour=1                  	; 0=first entry 1=last entry
+scroll_behaviour=0              	; 0=page-system 1=classic
+quick_boot=1                    	; 'START' boots last rom
+sound_on=1                      	; sounds 1=on 0=off
+bgm_on=1                      	  ; music 1=on 0=off
+page_display=1                  	; display page
+tv_mode=0                       	; 1=ntsc 2=pal 3=mpal 0=force_off
+enable_colored_list=1           	; 1=enable 0=disable
+ext_type=1                      	; 0=classic 1=OS64
+sd_speed=2                      	; 1=25MHz 2=50MHz
+background_image=			; backgrund png image 320x240 32bit
+hide_sysfolder=1                	; 1=hide 0=don't hide
+mempak_path=/MEMPAKS/           	; surround with slashes
+save_path=SDSAVE                	; save directory inside ED64
 
 [user]
-name = Altra64                  ; Username
-
-[gblite]
-save_path=/ED64/SDSAVE/         ; save directory surround with slashes
-tv_mode=0                       ; 1=ntsc 2=pal 3=mpal 0=force_off
+name = Altra64                  	; Username