ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #323 from Diegoisawesome/master

Browse Source 
Fix gbafix
This commit is contained in:
Diegoisawesome 2018-09-11 17:34:37 -05:00 committed by GitHub
commit b9e0cf9f6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -173,5 +173,5 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
$(ROM): $(ELF) $(ROM): $(ELF)
$(OBJCOPY) -O binary $< $@ $(OBJCOPY) -O binary $< $@
$(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) -silent $(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent

17
tools/gbafix/gbafix.c
View File

@ -33,6 +33,7 @@
History History
------- -------
v1.06 - added output silencing, (Diegoisawesome)
v1.05 - added debug offset argument, (Diegoisawesome) v1.05 - added debug offset argument, (Diegoisawesome)
v1.04 - converted to plain C, (WinterMute) v1.04 - converted to plain C, (WinterMute)
v1.03 - header.fixed, header.device_type v1.03 - header.fixed, header.device_type
@ -48,7 +49,7 @@
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
#define VER "1.05" #define VER "1.06"
#define ARGV argv[arg] #define ARGV argv[arg]
#define VALUE (ARGV+2) #define VALUE (ARGV+2)
#define NUMBER strtoul(VALUE, NULL, 0) #define NUMBER strtoul(VALUE, NULL, 0)
@ -143,7 +144,7 @@ int main(int argc, char *argv[])
if (argc <= 1) if (argc <= 1)
{ {
printf("GBA ROM fixer v"VER" by Dark Fader / BlackThunder / WinterMute / Diegoisawesome \n"); printf("GBA ROM fixer v"VER" by Dark Fader / BlackThunder / WinterMute / Diegoisawesome \n");
printf("Syntax: gbafix <rom.gba> [-p] [-t[title]] [-c<game_code>] [-m<maker_code>] [-r<version>] [-d<debug>] [-silent]\n"); printf("Syntax: gbafix <rom.gba> [-p] [-t[title]] [-c<game_code>] [-m<maker_code>] [-r<version>] [-d<debug>] [--silent]\n");
printf("\n"); printf("\n");
printf("parameters:\n"); printf("parameters:\n");
printf(" -p Pad to next exact power of 2. No minimum size!\n"); printf(" -p Pad to next exact power of 2. No minimum size!\n");
@ -152,7 +153,7 @@ int main(int argc, char *argv[])
printf(" -m<maker_code> Patch maker code (two characters)\n"); printf(" -m<maker_code> Patch maker code (two characters)\n");
printf(" -r<version> Patch game version (number)\n"); printf(" -r<version> Patch game version (number)\n");
printf(" -d<debug> Enable debugging handler and set debug entry point (0 or 1)\n"); printf(" -d<debug> Enable debugging handler and set debug entry point (0 or 1)\n");
printf(" -silent Silence non-error output\n"); printf(" --silent Silence non-error output\n");
return -1; return -1;
} }
@ -160,7 +161,7 @@ int main(int argc, char *argv[])
for (arg=1; arg<argc; arg++) for (arg=1; arg<argc; arg++)
{ {
if ((ARGV[0] != '-')) { argfile=ARGV; } if ((ARGV[0] != '-')) { argfile=ARGV; }
if (strncmp("-silent", &ARGV[0], 6) == 0) { silent = 1; } if (strncmp("--silent", &ARGV[0], 7) == 0) { silent = 1; }
} }
// check filename // check filename
@ -186,8 +187,6 @@ int main(int argc, char *argv[])
{ {
if ((ARGV[0] == '-')) if ((ARGV[0] == '-'))
{ {
if (strncmp("-silent", &ARGV[0], 6) == 0) { continue; }
switch (ARGV[1]) switch (ARGV[1])
{ {
case 'p': // pad case 'p': // pad
@ -261,7 +260,11 @@ int main(int argc, char *argv[])
header.device_type = (unsigned char)((NUMBER & 1) << 7); // debug handler entry point header.device_type = (unsigned char)((NUMBER & 1) << 7); // debug handler entry point
break; break;
} }
case '-': // long arguments
{
if (strncmp("silent", &ARGV[2], 6) == 0) { continue; }
break;
}
default: default:
{ {
printf("Invalid option: %s\n", ARGV); printf("Invalid option: %s\n", ARGV);