diff options
| -rw-r--r-- | arm9/Makefile | 4 | ||||
| -rw-r--r-- | charmap.txt | bin | 0 -> 46016 bytes | |||
| -rw-r--r-- | contrib/docker/Dockerfile | 10 | ||||
| -rwxr-xr-x | contrib/docker/build_docker.sh | 11 | ||||
| -rw-r--r-- | include/MWC_string.h | 1 | ||||
| -rw-r--r-- | include/string16.h | 6 | ||||
| -rw-r--r-- | tools/o2narc/elf.h | 14 |
7 files changed, 34 insertions, 12 deletions
diff --git a/arm9/Makefile b/arm9/Makefile index 17033200..36e19417 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -192,7 +192,11 @@ LDFLAGS = -nodead -w off -proc v5te -interworking -map closure,unused -symtab so ####################### Other Tools ######################### # DS TOOLS +ifndef BUSYBOX SHA1SUM = sha1sum --quiet +else +SHA1SUM = sha1sum +endif JSONPROC = $(TOOLS_DIR)/jsonproc/jsonproc$(EXE) GFX = $(TOOLS_DIR)/nitrogfx/nitrogfx$(EXE) SCANINC = $(TOOLS_DIR)/scaninc/scaninc$(EXE) diff --git a/charmap.txt b/charmap.txt Binary files differnew file mode 100644 index 00000000..41724bdf --- /dev/null +++ b/charmap.txt diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile new file mode 100644 index 00000000..76bf6176 --- /dev/null +++ b/contrib/docker/Dockerfile @@ -0,0 +1,10 @@ +FROM i386/alpine + +RUN apk update +RUN apk add --no-cache build-base libpng-dev wine ncurses freetype +RUN apk add binutils-arm-none-eabi --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted + +ENV BUSYBOX 1 +WORKDIR /app + +CMD ["/bin/sh"] diff --git a/contrib/docker/build_docker.sh b/contrib/docker/build_docker.sh new file mode 100755 index 00000000..b59e2158 --- /dev/null +++ b/contrib/docker/build_docker.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +ver="0.1" + +docker inspect pokediamond:$ver > /dev/null +if [ $? = 0 ]; then + echo "Not rebuilding image since image exists"; +else + docker build -t pokediamond:$ver $(git rev-parse --show-toplevel)/contrib/docker +fi +docker run --network=none -it -v $(git rev-parse --show-toplevel):/app pokediamond:$ver diff --git a/include/MWC_string.h b/include/MWC_string.h index d2980fb6..79639239 100644 --- a/include/MWC_string.h +++ b/include/MWC_string.h @@ -4,5 +4,6 @@ #include "nitro/types.h" void * memset(void *, int, u32); +void * memcpy(void *, const void *, u32); #endif //GUARD_MWC_STRING_H diff --git a/include/string16.h b/include/string16.h index 91888a7b..71880020 100644 --- a/include/string16.h +++ b/include/string16.h @@ -3,11 +3,11 @@ struct String { - u16 len; - u16 pos; + u16 maxsize; + u16 size; u32 magic; - u16 unk8; u16 data[1]; + u8 padding[2]; }; struct String * String_ctor(u32 count, u32 heap_id); diff --git a/tools/o2narc/elf.h b/tools/o2narc/elf.h index ad47e94e..c5f9f279 100644 --- a/tools/o2narc/elf.h +++ b/tools/o2narc/elf.h @@ -1,15 +1,13 @@ #ifndef _ELF_H #define _ELF_H 1 -#ifdef __cplusplus -extern "C" { -#endif - /* Standard ELF types. */ #include <inttypes.h> -__BEGIN_DECLS +#ifdef __cplusplus +extern "C" { +#endif /* Type for a 16-bit quantity. */ typedef uint16_t Elf32_Half; @@ -2425,10 +2423,8 @@ typedef Elf32_Addr Elf32_Conflict; #define R_X86_64_NUM 24 -__END_DECLS - #ifdef __cplusplus }; -#endif //__cplusplus +#endif -#endif /* elf.h */
\ No newline at end of file +#endif /* elf.h */ |