Improve local variable names in SubchrMain

This commit is contained in:
gamemasterplc 2023-11-23 12:32:29 -06:00
parent 824ccd1ac6
commit 905f5a7e73

View file

@ -64,12 +64,12 @@ static u16 GetBtns(void)
static void SubchrMain() static void SubchrMain()
{ {
int prev_character[4];
int character[4]; int character[4];
int ext_character[4];
int i, cursor_pos; int i, cursor_pos;
for(i=0; i<4; i++) { for(i=0; i<4; i++) {
prev_character[i] = gPlayerConfig[i].character; character[i] = gPlayerConfig[i].character;
character[i] = 0; ext_character[i] = 0;
cur_direction[i] = 0; cur_direction[i] = 0;
} }
cursor_pos = 0; cursor_pos = 0;
@ -88,16 +88,16 @@ static void SubchrMain()
} else { } else {
fontcolor = 12; fontcolor = 12;
} }
if(character[i] != 0) { if(ext_character[i] != 0) {
print8(x+200, y, 2.0f, ext_character_str[character[i]]); print8(x+200, y, 2.0f, ext_character_str[ext_character[i]]);
} else { } else {
print8(x+200, y, 2.0f, character_str[prev_character[i]]); print8(x+200, y, 2.0f, character_str[character[i]]);
} }
} }
if(GetBtns() & 0x1000) { if(GetBtns() & 0x1000) {
for(i=0; i<4; i++) { for(i=0; i<4; i++) {
if(character[i] != 0) { if(ext_character[i] != 0) {
gPlayerConfig[i]. character = character[i]+7; gPlayerConfig[i]. character = ext_character[i]+7;
} }
} }
fn_80032A58(30); fn_80032A58(30);
@ -111,13 +111,13 @@ static void SubchrMain()
} else { } else {
if(GetBtns() & 0x1) { if(GetBtns() & 0x1) {
do { do {
character[cursor_pos]--; ext_character[cursor_pos]--;
if(character[cursor_pos] < 0) { if(ext_character[cursor_pos] < 0) {
character[cursor_pos] = 6; ext_character[cursor_pos] = 6;
} }
for(i=0; i<4; i++) { for(i=0; i<4; i++) {
if(cursor_pos != i) { if(cursor_pos != i) {
if(character[cursor_pos] == character[i] && character[cursor_pos] != 0) { if(ext_character[cursor_pos] == ext_character[i] && ext_character[cursor_pos] != 0) {
break; break;
} }
} }
@ -126,13 +126,13 @@ static void SubchrMain()
} }
if(GetBtns() & 0x2) { if(GetBtns() & 0x2) {
do { do {
character[cursor_pos]++; ext_character[cursor_pos]++;
if(character[cursor_pos] > 6) { if(ext_character[cursor_pos] > 6) {
character[cursor_pos] = 0; ext_character[cursor_pos] = 0;
} }
for(i=0; i<4; i++) { for(i=0; i<4; i++) {
if(cursor_pos != i) { if(cursor_pos != i) {
if(character[cursor_pos] == character[i] && character[cursor_pos] != 0) { if(ext_character[cursor_pos] == ext_character[i] && ext_character[cursor_pos] != 0) {
break; break;
} }
} }