Skip to content

Commit

Permalink
Added error handler
Browse files Browse the repository at this point in the history 
Included error handling functionality to display a warning message if a
configuration includes 2+ of a key item, duplicate item stacks, or
invalid/glitch items, as well as functionality to suppress warning
output.
  • Loading branch information
@KernelEquinox
KernelEquinox committed Dec 13, 2016
1 parent 681fe33 commit 8ce2b39
Show file tree
Hide file tree
Showing 3 changed files with 138 additions and 3 deletions.
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Usage: gbz80aid [options] [hex]
Options:
-f file File mode (read input from file)
-o format Display output in a specific format
-w Disable item warning messages
-h Print this help message
Formats:
Expand Down
60 changes: 57 additions & 3 deletions gbz80aid.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ struct Label {
char *name;
};

// Struct for holding error detections
struct Error {
unsigned char key_quantity;
unsigned char duplicates;
unsigned char glitches;
};


// Global offset of current byte
int cur_offset = 0;
Expand All @@ -40,11 +47,15 @@ int line_num = 1;
int hex_size = 1;
char *hex_string;

// Show warnings by default
char show_warnings = 1;


int main(int argc, char* argv[])
{
char *format = 0, *input, *filename;
char interactive = 0, file_mode = 0;
char *format = 0;
char *input, *filename;
char file_mode = 0;

// Show help
if (argc == 1)
Expand All @@ -62,6 +73,8 @@ int main(int argc, char* argv[])
format = argv[++i];
else if (!strcmp(argv[i], "-h"))
usage(argv[0]);
else if (!strcmp(argv[i], "-w"))
show_warnings = 0;
else
input = argv[i];
}
Expand Down Expand Up @@ -114,6 +127,7 @@ void usage(char *str)
printf("Options:\n");
printf(" -f file File mode (read input from file)\n");
printf(" -o format Display output in a specific format\n");
printf(" -w Disable item warning messages\n");
printf(" -h Print this help message\n\n");
printf("Formats:\n");
printf(" asm GB-Z80 assembly language\n");
Expand Down Expand Up @@ -254,12 +268,14 @@ char* op2hex(char *opcode, char *param, char *args)
void jump2addr(char *param)
{
for (int i = 0; i < jmp_num; i++)
{
if (!strcmp(label[i].name, param))
{
unsigned char addr = ~(cur_offset - label[i].address) - 1;
param[0] = '$';
sprintf(param + 1, "%x", addr & 0xFF);
}
}
}


Expand Down Expand Up @@ -398,6 +414,7 @@ void asm_to_hex(char *str)
// Update the label array if a label was detected
if (str[i] == '.' || strchr(str, ':'))
{
strip_spaces(str);
nullify_char(str, ':');
// Dynamically expand array as needed
label = realloc(label, (jmp_num + 1) * sizeof(*label));
Expand Down Expand Up @@ -451,8 +468,17 @@ void asm_to_hex(char *str)
// Converts hex string into Gen I items for 8F
void hex_to_gen(char *str, int gen)
{
// Error handler for weird item setups
struct Error errors = {0};

strip_spaces(str);
int len = strlen(str);
unsigned char seen_items[16][16] = {0};

// Warning placeholders
unsigned char glitch_items = 0;
unsigned char multi_key_items = 0;
unsigned char duplicate_items = 0;

printf("\nItem Quantity\n");
printf("========================\n");
Expand All @@ -468,24 +494,52 @@ void hex_to_gen(char *str, int gen)
char l = str[i++];
char *item = (gen == 1 ? gen1_items[h][l] : gen2_items[h][l]);
char *quantity = calloc(4, sizeof(char));
unsigned char conversion = 0;

h_cursor += strlen(item);

// Grab next byte as quantity
if (str[i])
{
ascii2hex(str + i, 2);
unsigned char conversion = str[i++] << 4;
conversion = str[i++] << 4;
conversion |= str[i++];
sprintf(quantity, "%d", conversion);
}
// Set as "Any" if any quantity will do
else
quantity = "Any";

// Print item/quantity pairs
printf("%s", item);
for (; h_cursor < 16; h_cursor++)
printf(" ");
printf("x%s\n", quantity);

// [Error] Key items with 2+ quantity
if ((gen == 1 ? gen1_key_items[h][l] : gen2_key_items[h][l]))
if (conversion && conversion != 1)
errors.key_quantity = 1;
// [Error] Invalid or glitch items
if ((gen == 1 ? gen1_glitch_items[h][l] : gen2_glitch_items[h][l]))
errors.glitches = 1;
// [Error] Duplicate item stacks
if (seen_items[h][l] == 1)
errors.duplicates = 1;
else
seen_items[h][l] = 1;
}

// Print errors
if (show_warnings)
if (errors.key_quantity || errors.glitches || errors.duplicates)
{
printf("\n\n-- WARNING! --\n");
if (errors.duplicates)
printf(" * Duplicate item stacks detected!\n");
if (errors.key_quantity)
printf(" * Key item with 2+ quantity detected!\n");
if (errors.glitches)
printf(" * Invalid and/or glitch items detected!\n");
}
}
80 changes: 80 additions & 0 deletions gbz80aid.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,46 @@ char *cb_param_table[16][16] = {
// List of prefixed instructions for quick comparison
char *cb_set[11] = {"bit","res","rl","rlc","rr","rrc","set","sla","sra","srl","swap"};

// Key item flags for R/B/Y
unsigned char gen1_key_items[16][16] = {
{0,0,0,0,0,1,1,1,0,1,0,0,0,0,0,0},
{0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,1},
{0,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0},
{1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1},
{1,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0},
{0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1},
{1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}
};

// Glitch item flags for R/B/Y
unsigned char gen1_glitch_items[16][16] = {
{1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0},
{0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1},
{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
{1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1}
};

// Items included in Pokemon R/B/Y
char *gen1_items[16][16] = {
{"[item 0x00]", "Master Ball", "Ultra Ball", "Great Ball",
Expand Down Expand Up @@ -285,6 +325,46 @@ char *gen1_items[16][16] = {
"TM52", "TM53", "TM54", "CANCEL (TM55)"}
};

// Key item flags for G/S/C
unsigned char gen2_key_items[16][16] = {
{0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,1,1,0,1,1,1,0,1,0,0},
{0,0,1,1,1,1,1,1,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0},
{0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,1},
{1,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
{0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1}
};

// Glitch item flags for G/S/C
unsigned char gen2_glitch_items[16][16] = {
{1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0},
{0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0},
{0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,1,1,0,0,0,1,1,0,0},
{0,1,0,1,1,1,0,0,0,1,1,1,0,0,0,0},
{0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0},
{1,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
};

// Items included in Pokemon G/S/C
char *gen2_items[16][16] = {
{"?", "Master Ball", "Ultra Ball", "Brightpowder",
Expand Down

0 comments on commit 8ce2b39

Please sign in to comment.