dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Document size field of unknown struct

Browse Source
This commit is contained in:
PokeCodec
2020-09-09 16:05:22 -04:00
parent a32f631fe6
commit 7f1827767c
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/pokemon.h
+3 -3
View File
@@ -126,9 +126,9 @@ struct Unknown_806F160_Struct
u32 field_0_0:4; u32 field_0_0:4;
u32 field_0_1:4; u32 field_0_1:4;
u32 field_1:8; u32 field_1:8;
u32 magic:8; u16 magic:8;
u32 field_3_0:4; u32 size:4;
u32 field_3_1:4; u16 field_3_1:4;
void *bytes; void *bytes;
u8 **byteArrays; u8 **byteArrays;
struct SpriteTemplate *templates; struct SpriteTemplate *templates;
src/pokedex.c
+4 -6
View File
@@ -5453,8 +5453,8 @@ static void PrintSearchParameterText(u8 taskId)
const struct SearchOptionText *texts = sSearchOptions[gTasks[taskId].tMenuItem].texts; const struct SearchOptionText *texts = sSearchOptions[gTasks[taskId].tMenuItem].texts;
const u16 *cursorPos = &gTasks[taskId].data[sSearchOptions[gTasks[taskId].tMenuItem].taskDataCursorPos]; const u16 *cursorPos = &gTasks[taskId].data[sSearchOptions[gTasks[taskId].tMenuItem].taskDataCursorPos];
const u16 *scrollOffset = &gTasks[taskId].data[sSearchOptions[gTasks[taskId].tMenuItem].taskDataScrollOffset]; const u16 *scrollOffset = &gTasks[taskId].data[sSearchOptions[gTasks[taskId].tMenuItem].taskDataScrollOffset];
u16 i;
u16 j; u16 i, j;
ClearSearchParameterBoxText(); ClearSearchParameterBoxText();
@@ -5543,8 +5543,7 @@ static bool8 SearchParamCantScrollUp(u8 taskId)
if (lastOption > MAX_SEARCH_PARAM_CURSOR_POS && *scrollOffset != 0) if (lastOption > MAX_SEARCH_PARAM_CURSOR_POS && *scrollOffset != 0)
return FALSE; return FALSE;
else return TRUE;
return TRUE;
} }
static bool8 SearchParamCantScrollDown(u8 taskId) static bool8 SearchParamCantScrollDown(u8 taskId)
@@ -5555,8 +5554,7 @@ static bool8 SearchParamCantScrollDown(u8 taskId)
if (lastOption > MAX_SEARCH_PARAM_CURSOR_POS && *scrollOffset < lastOption - MAX_SEARCH_PARAM_CURSOR_POS) if (lastOption > MAX_SEARCH_PARAM_CURSOR_POS && *scrollOffset < lastOption - MAX_SEARCH_PARAM_CURSOR_POS)
return FALSE; return FALSE;
else return TRUE;
return TRUE;
} }
#define sTaskId data[0] #define sTaskId data[0]
src/pokemon.c
+5 -5
View File
@@ -6858,7 +6858,7 @@ struct Unknown_806F160_Struct *sub_806F2AC(u8 id, u8 arg1)
structPtr->field_0_0 = 7; structPtr->field_0_0 = 7;
structPtr->field_0_1 = 7; structPtr->field_0_1 = 7;
structPtr->field_1 = 4; structPtr->field_1 = 4;
structPtr->field_3_0 = 1; structPtr->size = 1;
structPtr->field_3_1 = 2; structPtr->field_3_1 = 2;
break; break;
case 0: case 0:
@@ -6866,12 +6866,12 @@ struct Unknown_806F160_Struct *sub_806F2AC(u8 id, u8 arg1)
structPtr->field_0_0 = 4; structPtr->field_0_0 = 4;
structPtr->field_0_1 = 4; structPtr->field_0_1 = 4;
structPtr->field_1 = 4; structPtr->field_1 = 4;
structPtr->field_3_0 = 1; structPtr->size = 1;
structPtr->field_3_1 = 0; structPtr->field_3_1 = 0;
break; break;
} }
structPtr->bytes = AllocZeroed(structPtr->field_3_0 * 0x800 * 4 * structPtr->field_0_0); structPtr->bytes = AllocZeroed(structPtr->size * 0x800 * 4 * structPtr->field_0_0);
structPtr->byteArrays = AllocZeroed(structPtr->field_0_0 * 32); structPtr->byteArrays = AllocZeroed(structPtr->field_0_0 * 32);
if (structPtr->bytes == NULL || structPtr->byteArrays == NULL) if (structPtr->bytes == NULL || structPtr->byteArrays == NULL)
{ {
@@ -6880,7 +6880,7 @@ struct Unknown_806F160_Struct *sub_806F2AC(u8 id, u8 arg1)
else else
{ {
for (i = 0; i < structPtr->field_0_0; i++) for (i = 0; i < structPtr->field_0_0; i++)
structPtr->byteArrays[i] = structPtr->bytes + (structPtr->field_3_0 * (i << 0xD)); structPtr->byteArrays[i] = structPtr->bytes + (structPtr->size * (i << 0xD));
} }
structPtr->templates = AllocZeroed(sizeof(struct SpriteTemplate) * structPtr->field_0_0); structPtr->templates = AllocZeroed(sizeof(struct SpriteTemplate) * structPtr->field_0_0);
@@ -6899,8 +6899,8 @@ struct Unknown_806F160_Struct *sub_806F2AC(u8 id, u8 arg1)
case 2: case 2:
sub_806F1FC(structPtr); sub_806F1FC(structPtr);
break; break;
case 0:
case 1: case 1:
case 0:
default: default:
sub_806F160(structPtr); sub_806F160(structPtr);
break; break;