Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-03-21 17:55:13 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Renamed option struct elements (#550)

Browse Source
This commit is contained in:
Eduardo Quezada 2025-06-22 13:55:07 -04:00 committed by GitHub
parent 029f949448
commit e1874d99c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
97 changed files with 272 additions and 325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/overlay006/struct_ov6_02246254.h
View File

@ -11,7 +11,7 @@ typedef struct {
const TrainerInfo *unk_08;
int unk_0C;
int unk_10;
const Options *unk_14;
const Options *options;
} UnkStruct_ov6_02246254;
#endif // POKEPLATINUM_STRUCT_OV6_02246254_H

2
include/overlay022/struct_ov22_02256BAC.h
View File

@ -13,7 +13,7 @@ typedef struct {
BgConfig *unk_00;
SpriteList *unk_04;
SpriteResourceCollection **unk_08;
const Options *unk_0C;
const Options *options;
int unk_10;
int unk_14;
int unk_18;

2
include/overlay062/ov62_02246B00.h
View File

@ -7,7 +7,7 @@
#include "game_options.h"
#include "touch_screen.h"
UnkStruct_ov62_02246B00 *ov62_02246B00(int heapID, int param1, int param2[], Options *param3);
UnkStruct_ov62_02246B00 *ov62_02246B00(int heapID, int param1, int param2[], Options *options);
void ov62_02246B4C(UnkStruct_ov62_02246B00 *param0);
void ov62_02246B70(UnkStruct_ov62_02246BF4 *param0, int param1);
void ov62_02246BF4(UnkStruct_ov62_02246BF4 *param0);

2
include/overlay062/struct_ov62_02246B00.h
View File

@ -9,7 +9,7 @@ typedef struct {
int unk_04[4];
u8 padding_14[4];
Strbuf *unk_18;
Options *unk_1C;
Options *options;
} UnkStruct_ov62_02246B00;
#endif // POKEPLATINUM_STRUCT_OV62_02246B00_H

2
include/overlay072/struct_ov72_0223DB98_t.h
View File

@ -21,7 +21,7 @@ struct UnkStruct_ov72_0223DB98_t {
BgConfig *unk_00;
BOOL unk_04;
GameRecords *records;
Options *unk_0C;
Options *options;
StringTemplate *unk_10;
MessageLoader *unk_14;
Strbuf *unk_18[5];

2
include/overlay084/struct_ov84_0223B5A0.h
View File

@ -27,7 +27,7 @@ typedef struct {
UnkStruct_0207CB08 *unk_C4;
Bag *unk_C8;
TrainerInfo *unk_CC;
Options *unk_D0;
Options *options;
NARC *unk_D4;
SpriteSystem *unk_D8;
SpriteManager *unk_DC;

2
include/overlay088/ov88_0223E9C4.h
View File

@ -10,7 +10,7 @@
#include "string_list.h"
#include "string_template.h"
void ov88_0223E9C4(BgConfig *param0, Window *param1, Options *param2);
void ov88_0223E9C4(BgConfig *param0, Window *param1, Options *options);
void ov88_0223EC04(Window *param0);
void ov88_0223EC78(Window *param0, Strbuf *param1, int param2, u32 param3, int param4, int param5);
int ov88_0223ECBC(Window *param0, int param1, int param2, MessageLoader *param3, StringTemplate *param4);

2
include/overlay088/struct_ov88_0223C370.h
View File

@ -22,7 +22,7 @@ typedef struct {
PalPad *unk_0C;
SaveData *saveData;
WiFiHistory *wiFiHistory;
Options *unk_18;
Options *options;
JournalEntry *unk_1C;
GameRecords *records;
Pokedex *unk_24;

2
include/overlay098/struct_ov98_02246E88.h
View File

@ -15,7 +15,7 @@
typedef struct {
ApplicationManager *appMan;
SaveData *saveData;
Options *unk_08;
Options *options;
void *unk_0C;
NNSFndHeapHandle unk_10;
DWCInetControl unk_14;

2
include/struct_defs/struct_0203D9B8.h
View File

@ -20,7 +20,7 @@ typedef struct {
TrainerInfo *unk_0C;
Party *unk_10;
Bag *unk_14;
Options *unk_18;
Options *options;
UnkStruct_020989DC unk_1C[100];
} UnkStruct_0203D9B8;

2
include/struct_defs/struct_0203DA00.h
View File

@ -13,7 +13,7 @@ typedef struct {
Pokemon *unk_00;
UnkStruct_02029C68 *unk_04;
const UnkStruct_02029D04 *unk_08;
const Options *unk_0C;
const Options *options;
GameRecords *records;
const TrainerInfo *unk_14;
BOOL *unk_18;

2
include/struct_defs/struct_0203DDFC.h
View File

@ -9,7 +9,7 @@
typedef struct {
UnkStruct_0205C22C *unk_00;
JournalEntry *unk_04;
Options *unk_08;
Options *options;
} UnkStruct_0203DDFC;
#endif // POKEPLATINUM_STRUCT_0203DDFC_H

2
include/struct_defs/struct_0203DE34.h
View File

@ -11,7 +11,7 @@
typedef struct {
SaveData *saveData;
UnkStruct_0205C22C *unk_04;
Options *unk_08;
Options *options;
GameRecords *records;
JournalEntry *unk_10;
} UnkStruct_0203DE34;

2
include/struct_defs/struct_0203E0FC.h
View File

@ -26,7 +26,7 @@ typedef struct {
WiFiHistory *wiFiHistory;
TrainerInfo *unk_1C;
SaveData *saveData;
Options *unk_24;
Options *options;
GameRecords *records;
JournalEntry *unk_2C;
Bag *unk_30;

2
include/struct_defs/struct_0203E2FC.h
View File

@ -7,7 +7,7 @@
typedef struct {
Pokemon *unk_00;
Options *unk_04;
Options *options;
TrainerInfo *unk_08;
u16 unk_0C;
} UnkStruct_0203E2FC;

2
include/struct_defs/struct_0206BC70.h
View File

@ -15,7 +15,7 @@ typedef struct {
UnkStruct_0202D764 *unk_04;
SystemData *unk_08;
SaveData *saveData;
Options *unk_10;
Options *options;
DWCUserData *unk_14;
int unk_18;
int unk_1C;

2
include/struct_defs/struct_0207AE68_t.h
View File

@ -34,7 +34,7 @@ struct UnkStruct_0207AE68_t {
PokemonSprite *unk_1C[2];
Party *unk_24;
Pokemon *unk_28;
Options *unk_2C;
Options *options;
UnkStruct_0207C8C4 *unk_30;
GenericPointerData *unk_34;
ApplicationManager *appMan;

2
include/struct_defs/struct_0208737C.h
View File

@ -17,7 +17,7 @@ typedef struct {
u16 unk_1C[20];
int unk_44;
PCBoxes *unk_48;
Options *unk_4C;
Options *options;
} UnkStruct_0208737C;
#endif // POKEPLATINUM_STRUCT_0208737C_H

2
include/struct_defs/struct_02089438.h
View File

@ -9,7 +9,7 @@ typedef struct {
int unk_04[5];
int unk_18;
Strbuf *unk_1C;
Options *unk_20;
Options *options;
int unk_24;
u32 unk_28;
u32 unk_2C;

2
include/struct_defs/struct_02093800.h
View File

@ -21,7 +21,7 @@ typedef struct {
const Strbuf *unk_0C;
const TrainerInfo *unk_10;
UnkStruct_0202A750 *unk_14;
const Options *unk_18;
const Options *options;
SaveData *saveData;
void *unk_20;
} UnkStruct_02093800;

2
include/struct_defs/struct_02093BBC.h
View File

@ -18,7 +18,7 @@ typedef struct {
int unk_14;
const UnkStruct_02029D04 *unk_18;
UnkStruct_02095C60 *unk_1C;
const Options *unk_20;
const Options *options;
const TrainerInfo *unk_24;
} UnkStruct_02093BBC;

2
include/struct_defs/struct_02095C48.h
View File

@ -31,7 +31,7 @@ typedef struct {
u8 unk_569[1024];
u8 unk_969[4][1024];
u8 padding_1969[3];
const Options *unk_196C;
const Options *options;
SaveData *saveData;
Pokemon *unk_1974;
const TrainerInfo *unk_1978;

2
include/struct_defs/struct_02097F18.h
View File

@ -13,7 +13,7 @@ typedef struct {
Pokemon *unk_04[6];
Party *unk_1C;
BallSeals *unk_20;
Options *unk_24;
Options *options;
SaveData *saveData;
u8 unk_2C;
u8 unk_2D;

2
include/struct_defs/struct_020985E4.h
View File

@ -6,7 +6,7 @@
typedef struct {
int unk_00;
Options *unk_04;
Options *options;
const TrainerInfo *unk_08;
} UnkStruct_020985E4;

2
include/struct_defs/struct_020997B8.h
View File

@ -8,7 +8,7 @@
typedef struct {
Pokemon *unk_00;
TrainerInfo *unk_04;
Options *unk_08;
Options *options;
u16 *unk_0C;
u16 unk_10;
u16 unk_12;

2
include/struct_defs/struct_0209C194_1.h
View File

@ -15,7 +15,7 @@ typedef struct {
int unk_04;
SaveData *saveData;
UnkStruct_0205C22C *unk_0C;
Options *unk_10;
Options *options;
GameRecords *records;
JournalEntry *unk_18;
FieldSystem *fieldSystem;

2
include/unk_0207AE68.h
View File

@ -11,7 +11,7 @@
#include "pokemon.h"
#include "poketch.h"
UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, Pokedex *param5, Bag *param6, GameRecords *records, Poketch *poketch, int param9, int param10, int heapID);
UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *options, int param4, Pokedex *param5, Bag *param6, GameRecords *records, Poketch *poketch, int param9, int param10, int heapID);
BOOL sub_0207B0D0(UnkStruct_0207AE68 *param0);
void sub_0207B0E0(UnkStruct_0207AE68 *param0);

2
include/unk_0208694C.h
View File

@ -5,7 +5,7 @@
#include "game_options.h"
UnkStruct_0208737C *sub_0208712C(int heapID, int param1, int param2, int param3, Options *param4);
UnkStruct_0208737C *sub_0208712C(int heapID, int param1, int param2, int param3, Options *options);
void sub_0208716C(UnkStruct_0208737C *param0);
#endif // POKEPLATINUM_UNK_0208694C_H

5
include/unk_020890F4.h
View File

@ -5,9 +5,8 @@
#include "game_options.h"
UnkStruct_02089438 *sub_020893B4(int heapID, int param1, int param2[], Options *param3, u32 param4, u32 param5);
UnkStruct_02089438 *sub_02089400(int heapID, int param1, int param2[], Options *param3, u32 param4, u32 param5);
UnkStruct_02089438 *sub_0208941C(int heapID, int param1, int param2[], Options *param3, u32 param4, u32 param5, u32 param6, u32 param7);
UnkStruct_02089438 *sub_02089400(int heapID, int param1, int param2[], Options *options, u32 param4, u32 param5);
UnkStruct_02089438 *sub_0208941C(int heapID, int param1, int param2[], Options *options, u32 param4, u32 param5, u32 param6, u32 param7);
void sub_02089438(UnkStruct_02089438 *param0);
#endif // POKEPLATINUM_UNK_020890F4_H

1
src/battle/ov16_0223DF00.c
View File

@ -126,7 +126,6 @@ u8 ov16_0223ED60(BattleSystem *battleSystem);
u8 ov16_0223ED6C(BattleSystem *battleSystem);
int BattleSystem_NumSafariBalls(BattleSystem *battleSystem);
void BattleSystem_SetSafariBalls(BattleSystem *battleSystem, int param1);
Options *BattleSystem_GetOptions(BattleSystem *battleSystem);
BOOL BattleSystem_AnimationsOn(BattleSystem *battleSys);
int ov16_0223EDE0(BattleSystem *battleSystem);
u8 BattleSystem_TextSpeed(BattleSystem *battleSystem);

2
src/overlay006/npc_trade.c
View File

@ -89,7 +89,7 @@ void ov6_02246254(FieldSystem *fieldSystem, NpcTradeData *data, int slot, UnkStr
param3->unk_04 = Pokemon_GetBoxPokemon(receivingMon);
param3->unk_08 = data->trainerInfo;
param3->unk_10 = 1;
param3->unk_14 = SaveData_GetOptions(fieldSystem->saveData);
param3->options = SaveData_GetOptions(fieldSystem->saveData);
int timeOfDay = FieldSystem_GetTimeOfDay(fieldSystem);
if (timeOfDay == TIMEOFDAY_MORNING || timeOfDay == TIMEOFDAY_DAY) {

2
src/overlay017/ov17_0223CB1C.c
View File

@ -605,7 +605,7 @@ static void ov17_0223D4A8(UnkStruct_ov17_02247A48 *param0, NARC *param1)
PaletteData_LoadBufferFromFileStart(param0->unk_0C.unk_44, 45, 35, 22, 0, 0, 0);
PaletteData_LoadBufferFromFileStart(param0->unk_0C.unk_44, 45, 36, 22, 0, 0x20, 13 * 16);
v0 = Options_Frame(param0->unk_00->unk_196C);
v0 = Options_Frame(param0->unk_00->options);
LoadMessageBoxGraphics(param0->unk_0C.unk_24, 1, 1, 15, v0, HEAP_ID_22);
PaletteData_LoadBufferFromFileStart(param0->unk_0C.unk_44, 38, GetMessageBoxPaletteNARCMember(v0), 22, 0, 0x20, 14 * 16);

2
src/overlay017/ov17_0223DAD0.c
View File

@ -794,7 +794,7 @@ static void ov17_0223E67C(UnkStruct_ov17_0224DF54 *param0, NARC *param1)
PaletteData_LoadBufferFromFileStart(param0->unk_14.unk_90, 45, 32, 23, 0, 0, 0);
PaletteData_LoadBufferFromFileStart(param0->unk_14.unk_90, 45, 36, 23, 0, 0x20, 13 * 16);
v0 = Options_Frame(param0->unk_00->unk_196C);
v0 = Options_Frame(param0->unk_00->options);
LoadMessageBoxGraphics(param0->unk_14.unk_60, 1, 1, 15, v0, HEAP_ID_23);
PaletteData_LoadBufferFromFileStart(param0->unk_14.unk_90, 38, GetMessageBoxPaletteNARCMember(v0), 23, 0, 0x20, 14 * 16);
ov17_0224C848(param0);

2
src/overlay017/ov17_022413D8.c
View File

@ -1497,7 +1497,7 @@ static void ov17_02242DC0(UnkStruct_ov17_02246F24 *param0, MessageLoader *param1
v1 = TEXT_SPEED_INSTANT;
} else {
if (param0->unk_00->unk_155 == 0) {
v1 = Options_TextFrameDelay(param0->unk_00->unk_196C);
v1 = Options_TextFrameDelay(param0->unk_00->options);
} else {
v1 = TEXT_SPEED_FAST;
}

2
src/overlay017/ov17_022476F8.c
View File

@ -201,7 +201,7 @@ static void ov17_02247990(UnkStruct_ov17_02247A48 *param0, MessageLoader *param1
int v1;
if (param0->unk_00->unk_155 == 0) {
v1 = Options_TextFrameDelay(param0->unk_00->unk_196C);
v1 = Options_TextFrameDelay(param0->unk_00->options);
} else {
v1 = TEXT_SPEED_FAST;
}

2
src/overlay017/ov17_0224A0FC.c
View File

@ -1913,7 +1913,7 @@ static void ov17_0224C244(UnkStruct_ov17_0224DF54 *param0, MessageLoader *param1
int v1;
if (param0->unk_00->unk_155 == 0) {
v1 = Options_TextFrameDelay(param0->unk_00->unk_196C);
v1 = Options_TextFrameDelay(param0->unk_00->options);
} else {
v1 = TEXT_SPEED_FAST;
}

6
src/overlay017/ov17_02250744.c
View File

@ -241,7 +241,7 @@ static void ov17_022508E4(UnkStruct_ov17_0224FCA0 *param0, MessageLoader *param1
int v1;
if (param0->unk_00->unk_155 == 0) {
v1 = Options_TextFrameDelay(param0->unk_00->unk_196C);
v1 = Options_TextFrameDelay(param0->unk_00->options);
} else {
v1 = TEXT_SPEED_FAST;
}
@ -285,7 +285,7 @@ void ov17_022509AC(UnkStruct_ov17_0224FCA0 *param0)
PaletteData_LoadBufferFromFileStart(param0->unk_10.unk_C0, 45, 35, 24, 0, 0, 0);
PaletteData_LoadBufferFromFileStart(param0->unk_10.unk_C0, 45, 36, 24, 0, 0x20, 13 * 16);
v0 = Options_Frame(param0->unk_00->unk_196C);
v0 = Options_Frame(param0->unk_00->options);
LoadMessageBoxGraphics(param0->unk_10.unk_20, 1, 1, 15, v0, HEAP_ID_24);
PaletteData_LoadBufferFromFileStart(param0->unk_10.unk_C0, 38, GetMessageBoxPaletteNARCMember(v0), 24, 0, 0x20, 14 * 16);
@ -322,7 +322,7 @@ void ov17_02250B00(UnkStruct_ov17_0224FCA0 *param0)
PaletteData_LoadBufferFromFileStart(param0->unk_10.unk_C0, 45, 39, 24, 0, 0, 0);
PaletteData_LoadBufferFromFileStart(param0->unk_10.unk_C0, 45, 36, 24, 0, 0x20, 13 * 16);
v0 = Options_Frame(param0->unk_00->unk_196C);
v0 = Options_Frame(param0->unk_00->options);
LoadMessageBoxGraphics(param0->unk_10.unk_20, 1, 1, 15, v0, HEAP_ID_24);
PaletteData_LoadBufferFromFileStart(param0->unk_10.unk_C0, 38, GetMessageBoxPaletteNARCMember(v0), 24, 0, 0x20, 14 * 16);

26
src/overlay022/ov22_02255D44.c
View File

@ -102,7 +102,7 @@ typedef struct {
int unk_72C;
int unk_730;
UnkStruct_02095C60 *unk_734;
const Options *unk_738;
const Options *options;
u32 unk_73C;
Strbuf *unk_740;
StringTemplate *unk_744;
@ -147,8 +147,8 @@ static void ov22_02256B04(UnkStruct_ov22_02259C58 *param0, void *param1);
static void ov22_02256B24(UnkStruct_ov22_02259C58 *param0, void *param1);
static void ov22_02256B44(UnkStruct_ov22_02259C58 *param0, void *param1);
static void ov22_02256B78(UnkStruct_ov22_02259C58 *param0, void *param1);
static void ov22_02256BAC(UnkStruct_ov22_02255D44 *param0, const Options *param1);
static void ov22_02256BF4(UnkStruct_ov22_02255D44 *param0, int param1, int param2, UnkStruct_02095C60 *param3, const Options *param4);
static void ov22_02256BAC(UnkStruct_ov22_02255D44 *param0, const Options *options);
static void ov22_02256BF4(UnkStruct_ov22_02255D44 *param0, int param1, int param2, UnkStruct_02095C60 *param3, const Options *options);
static void ov22_02256C38(UnkStruct_ov22_02255D44 *param0);
static void ov22_02256C48(UnkStruct_ov22_02255D44 *param0, BOOL *param1);
static void ov22_02256C70(SysTask *param0, void *param1);
@ -204,7 +204,7 @@ int ov22_02255D44(ApplicationManager *appMan, int *param1)
DisableHBlank();
v2 = ApplicationManager_Args(appMan);
v0->unk_738 = v2->unk_0C;
v0->options = v2->options;
EnableTouchPad();
v1 = InitializeTouchPad(4);
@ -222,7 +222,7 @@ int ov22_02255D44(ApplicationManager *appMan, int *param1)
ov22_022567FC(v0);
ov22_02256948(v0, 0);
ov22_0225699C(v0);
ov22_02256BAC(v0, v2->unk_0C);
ov22_02256BAC(v0, v2->options);
ov22_022589E0(&v0->unk_4FC, &v0->unk_458, &v0->unk_3CC, &v0->unk_00, &v0->unk_5C4, 1);
v0->unk_714 = sub_02015920(HEAP_ID_13);
@ -444,7 +444,7 @@ int ov22_02256174(ApplicationManager *appMan, int *param1)
ov22_02259484(&v0->unk_3C0, (700 + 1 + 18), HEAP_ID_13);
v0->unk_3C8 = ov22_02254DE0(700, HEAP_ID_13);
v0->unk_738 = v2->unk_20;
v0->options = v2->options;
if (v0->unk_734->unk_16 == 0) {
v0->unk_720 = ov22_02257580(v2->unk_0C);
@ -456,7 +456,7 @@ int ov22_02256174(ApplicationManager *appMan, int *param1)
ov22_022567FC(v0);
ov22_02256948(v0, 0);
ov22_02256A28(v0);
ov22_02256BF4(v0, v0->unk_720, v2->unk_08, v2->unk_1C, v2->unk_20);
ov22_02256BF4(v0, v0->unk_720, v2->unk_08, v2->unk_1C, v2->options);
ov22_022589E0(&v0->unk_4FC, &v0->unk_458, &v0->unk_3CC, &v0->unk_00, &v0->unk_5C4, 0);
v0->unk_714 = sub_02015920(HEAP_ID_13);
@ -921,7 +921,7 @@ static void ov22_02256B78(UnkStruct_ov22_02259C58 *param0, void *param1)
}
}
static void ov22_02256BAC(UnkStruct_ov22_02255D44 *param0, const Options *param1)
static void ov22_02256BAC(UnkStruct_ov22_02255D44 *param0, const Options *options)
{
UnkStruct_ov22_02256BAC v0;
@ -931,13 +931,13 @@ static void ov22_02256BAC(UnkStruct_ov22_02255D44 *param0, const Options *param1
v0.unk_04 = param0->unk_00.unk_44;
v0.unk_08 = param0->unk_00.unk_48;
v0.unk_10 = 10;
v0.unk_0C = param1;
v0.options = options;
v0.unk_24 = param0->unk_00.unk_5C;
ov22_0225A428(&param0->unk_5C4, &v0, (1 | 2 | 4 | 8));
}
static void ov22_02256BF4(UnkStruct_ov22_02255D44 *param0, int param1, int param2, UnkStruct_02095C60 *param3, const Options *param4)
static void ov22_02256BF4(UnkStruct_ov22_02255D44 *param0, int param1, int param2, UnkStruct_02095C60 *param3, const Options *options)
{
UnkStruct_ov22_02256BAC v0;
BOOL v1;
@ -950,7 +950,7 @@ static void ov22_02256BF4(UnkStruct_ov22_02255D44 *param0, int param1, int param
v0.unk_18 = 7 + param2;
v0.unk_1C = 60;
v0.unk_20 = param3;
v0.unk_0C = param4;
v0.options = options;
v0.unk_24 = param0->unk_00.unk_5C;
ov22_0225A428(&param0->unk_5C4, &v0, (1 | 2 | 4 | 8 | 16 | 32));
@ -1328,7 +1328,7 @@ static void ov22_022572A0(UnkStruct_ov22_02255D44 *param0, u32 param1, u8 param2
{
MessageLoader *v0;
Strbuf *v1;
int v2 = Options_Frame(param0->unk_738);
int v2 = Options_Frame(param0->options);
Font_LoadScreenIndicatorsPalette(0, 7 * 32, HEAP_ID_14);
Window_Add(param0->unk_00.unk_40, param0->unk_718, 3, param2, param3, param4, param5, 7, (0 + (29 * 4) + (18 + 12)));
@ -1383,7 +1383,7 @@ static u32 ov22_022573EC(UnkStruct_ov22_02255D44 *param0, u32 param1)
StringTemplate_Format(param0->unk_744, param0->unk_740, v3);
if (param0->unk_734->unk_16 == 0) {
v2 = Options_TextFrameDelay(param0->unk_738);
v2 = Options_TextFrameDelay(param0->options);
} else {
v2 = TEXT_SPEED_FAST;
}

14
src/overlay022/ov22_0225A428.c
View File

@ -32,7 +32,7 @@
#include "unk_02095AF0.h"
static void ov22_0225A6E0(UnkStruct_ov22_022597BC *param0, BgConfig *param1);
static void ov22_0225A718(BgConfig *param0, const Options *param1);
static void ov22_0225A718(BgConfig *param0, const Options *options);
static void ov22_0225A748(Window **param0, BgConfig *param1, int param2, int param3, int param4, int param5, int param6, BOOL param7);
static void ov22_0225A7B8(UnkStruct_ov22_022597BC *param0);
static void ov22_0225A7C0(Window *param0);
@ -91,10 +91,10 @@ void ov22_0225A428(UnkStruct_ov22_0225A428 *param0, UnkStruct_ov22_02256BAC *par
param0->unk_30 = param1->unk_04;
param0->unk_34 = param1->unk_08;
ov22_0225A718(param1->unk_00, param1->unk_0C);
ov22_0225A718(param1->unk_00, param1->options);
param0->unk_13C = Options_Frame(param1->unk_0C);
param0->unk_140 = Options_TextFrameDelay(param1->unk_0C);
param0->unk_13C = Options_Frame(param1->options);
param0->unk_140 = Options_TextFrameDelay(param1->options);
param0->unk_138 |= param2;
}
@ -193,11 +193,11 @@ static void ov22_0225A6E0(UnkStruct_ov22_022597BC *param0, BgConfig *param1)
ov22_022597BC(param0, &v0);
}
static void ov22_0225A718(BgConfig *param0, const Options *param1)
static void ov22_0225A718(BgConfig *param0, const Options *options)
{
int v0 = Options_Frame(param1);
int frame = Options_Frame(options);
LoadMessageBoxGraphics(param0, 5, 1, 1, v0, HEAP_ID_14);
LoadMessageBoxGraphics(param0, 5, 1, 1, frame, HEAP_ID_14);
Font_LoadScreenIndicatorsPalette(4, 2 * 32, HEAP_ID_14);
}

2
src/overlay058/ov58_021D0D80.c
View File

@ -591,7 +591,7 @@ static void ov58_021D142C(UnkStruct_02095EAC *param0, NARC *param1)
Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 4, v0, 2, 0, 32 * 24 * 2, 1, HEAP_ID_39);
Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 3, v0, 5, 0, 32 * 8 * 0x20, 1, HEAP_ID_39);
Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 5, v0, 5, 0, 32 * 24 * 2, 1, HEAP_ID_39);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_08->unk_08), HEAP_ID_39);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_08->options), HEAP_ID_39);
LoadStandardWindowGraphics(v0, 0, 1 + (18 + 12), 11, 0, HEAP_ID_39);
}

2
src/overlay059/ov59_021D0D80.c
View File

@ -576,7 +576,7 @@ static void ov59_021D1388(UnkStruct_020961E8 *param0, NARC *param1)
Graphics_LoadTilemapToBgLayer(12, 11, v0, 6, 0, 0, 1, HEAP_ID_51);
Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 2, v0, 1, 0, 32 * 8 * 0x20, 1, HEAP_ID_51);
Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 3, v0, 1, 0, 32 * 24 * 2, 1, HEAP_ID_51);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_08->unk_08), HEAP_ID_51);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_08->options), HEAP_ID_51);
LoadStandardWindowGraphics(v0, 0, 1 + (18 + 12), 11, 0, HEAP_ID_51);
}

4
src/overlay062/ov62_02246B00.c
View File

@ -22,7 +22,7 @@
static inline void inline_ov62_02247CE0(UnkStruct_ov62_02246BF4 *param0, int param1, s16 param2, s16 param3);
UnkStruct_ov62_02246B00 *ov62_02246B00(int heapID, int param1, int param2[], Options *param3)
UnkStruct_ov62_02246B00 *ov62_02246B00(int heapID, int param1, int param2[], Options *options)
{
int v0;
UnkStruct_ov62_02246B00 *v1 = NULL;
@ -31,7 +31,7 @@ UnkStruct_ov62_02246B00 *ov62_02246B00(int heapID, int param1, int param2[], Opt
MI_CpuFill8(v1, 0, sizeof(UnkStruct_ov62_02246B00));
v1->unk_00 = param1;
v1->unk_18 = Strbuf_Init(param1 + 1, heapID);
v1->unk_1C = param3;
v1->options = options;
for (v0 = 0; v0 < 3; v0++) {
v1->unk_04[v0] = param2[v0];

7
src/overlay067/ov67_0225C700.c
View File

@ -568,11 +568,8 @@ static void ov67_0225CE30(UnkStruct_ov67_0225D154 *param0, u32 heapID)
}
{
Options *v1;
u8 v2;
v1 = SaveData_GetOptions(param0->saveData);
v2 = Options_Frame(v1);
Options *options = SaveData_GetOptions(param0->saveData);
u8 v2 = Options_Frame(options);
Font_LoadTextPalette(0, 12 * 32, heapID);
Font_LoadScreenIndicatorsPalette(0, 11 * 32, heapID);

42
src/overlay068/ov68_0225C700.c
View File

@ -126,7 +126,7 @@ static void ov68_0225C91C(UnkStruct_ov68_0225C91C *param0, SaveData *saveData, u
static void ov68_0225C960(UnkStruct_ov68_0225C91C *param0);
static void ov68_0225C980(UnkStruct_ov68_0225C91C *param0);
static void ov68_0225C98C(UnkStruct_ov68_0225C91C *param0);
static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *param1, u32 heapID);
static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *options, u32 heapID);
static void ov68_0225CA8C(UnkStruct_ov68_0225C91C *param0);
static void ov68_0225CAB4(UnkStruct_ov68_0225C91C *param0, u32 heapID);
static void ov68_0225CB44(UnkStruct_ov68_0225C91C *param0);
@ -431,12 +431,12 @@ static void ov68_0225C914(void *param0)
static void ov68_0225C91C(UnkStruct_ov68_0225C91C *param0, SaveData *saveData, u32 heapID)
{
Options *v0 = SaveData_GetOptions(saveData);
Options *options = SaveData_GetOptions(saveData);
param0->unk_1A4 = NARC_ctor(NARC_INDEX_GRAPHIC__WIFI_LOBBY_OTHER, heapID);
VramTransfer_New(32, heapID);
GXLayers_SetBanks(&Unk_ov68_0225DDC0);
ov68_0225C9A0(param0, v0, heapID);
ov68_0225C9A0(param0, options, heapID);
ov68_0225CAB4(param0, heapID);
}
@ -461,7 +461,7 @@ static void ov68_0225C98C(UnkStruct_ov68_0225C91C *param0)
VramTransfer_Process();
}
static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *param1, u32 heapID)
static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *options, u32 heapID)
{
SetAllGraphicsModes(&Unk_ov68_0225DD48);
@ -470,30 +470,22 @@ static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *param1, u32
GXLayers_SwapDisplay();
{
int v0;
int i;
for (v0 = 0; v0 < 4; v0++) {
Bg_InitFromTemplate(param0->unk_00, Unk_ov68_0225DD68[v0], &Unk_ov68_0225DE18[v0], 0);
Bg_ClearTilesRange(Unk_ov68_0225DD68[v0], 32, 0, heapID);
Bg_ClearTilemap(param0->unk_00, Unk_ov68_0225DD68[v0]);
}
for (i = 0; i < 4; i++) {
Bg_InitFromTemplate(param0->unk_00, Unk_ov68_0225DD68[i], &Unk_ov68_0225DE18[i], 0);
Bg_ClearTilesRange(Unk_ov68_0225DD68[i], 32, 0, heapID);
Bg_ClearTilemap(param0->unk_00, Unk_ov68_0225DD68[i]);
}
Font_LoadScreenIndicatorsPalette(0, 4 * 0x20, heapID);
{
u8 v1 = Options_Frame(param1);
LoadMessageBoxGraphics(param0->unk_00, 1, 1, 5, v1, heapID);
}
LoadMessageBoxGraphics(param0->unk_00, 1, 1, 5, Options_Frame(options), heapID);
LoadStandardWindowGraphics(param0->unk_00, 1, (1 + (18 + 12)), 6, 0, heapID);
{
Graphics_LoadTilesToBgLayer(169, 2, param0->unk_00, 4, 0, 0, 0, heapID);
Graphics_LoadTilemapToBgLayer(169, 6, param0->unk_00, 4, 0, 0, 0, heapID);
Graphics_LoadPalette(169, 0, 4, 0, 0, heapID);
}
Graphics_LoadTilesToBgLayer(169, 2, param0->unk_00, 4, 0, 0, 0, heapID);
Graphics_LoadTilemapToBgLayer(169, 6, param0->unk_00, 4, 0, 0, 0, heapID);
Graphics_LoadPalette(169, 0, 4, 0, 0, heapID);
}
static void ov68_0225CA8C(UnkStruct_ov68_0225C91C *param0)
@ -896,13 +888,7 @@ static void ov68_0225D128(UnkStruct_ov68_0225D128 *param0, UnkStruct_ov68_0225C9
Window_FillTilemap(&param0->unk_08, 15);
param0->unk_18 = Strbuf_Init(256, heapID);
{
Options *v0;
v0 = SaveData_GetOptions(saveData);
param0->unk_04 = Options_TextFrameDelay(v0);
}
param0->unk_04 = Options_TextFrameDelay(SaveData_GetOptions(saveData));
}
static void ov68_0225D178(UnkStruct_ov68_0225D128 *param0, u32 param1)

55
src/overlay069/ov69_0225C700.c
View File

@ -247,7 +247,7 @@ typedef struct {
u16 unk_02;
UnkStruct_ov69_0225DA74 unk_04;
WiFiHistory *wiFiHistory;
Options *unk_10;
Options *options;
int unk_14;
int unk_18;
UnkStruct_ov66_02231428 unk_1C;
@ -279,11 +279,11 @@ static u32 ov69_0225D194(const VecFx32 *param0, const VecFx32 *param1);
static u32 ov69_0225D1E0(const UnkStruct_ov69_0225CE64 *param0, u32 param1, UnkStruct_ov66_02231428 param2);
static BOOL ov69_0225D268(UnkStruct_ov69_0225CE64 *param0, u8 param1, u8 param2);
static void ov69_0225D2A8(UnkStruct_ov69_0225CE64 *param0, const UnkStruct_ov66_02230F50 *param1);
static void ov69_0225D318(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 heapID);
static void ov69_0225D318(UnkStruct_ov69_0225D35C *param0, Options *options, u32 heapID);
static void ov69_0225D35C(UnkStruct_ov69_0225D35C *param0);
static void ov69_0225D384(UnkStruct_ov69_0225D35C *param0);
static void ov69_0225D390(UnkStruct_ov69_0225D35C *param0);
static void ov69_0225D3A4(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 param2);
static void ov69_0225D3A4(UnkStruct_ov69_0225D35C *param0, Options *options, u32 param2);
static void ov69_0225D504(UnkStruct_ov69_0225D35C *param0);
static void ov69_0225D53C(UnkStruct_ov69_0225D35C *param0, u32 heapID);
static void ov69_0225D5D8(UnkStruct_ov69_0225D35C *param0);
@ -684,13 +684,13 @@ int ov69_0225C700(ApplicationManager *appMan, int *param1)
memset(v0, 0, sizeof(UnkStruct_ov69_0225CE64));
v0->wiFiHistory = SaveData_WiFiHistory(v1->saveData);
v0->unk_10 = SaveData_GetOptions(v1->saveData);
v0->options = SaveData_GetOptions(v1->saveData);
v0->unk_14 = WiFiHistory_GetCountry(v0->wiFiHistory);
v0->unk_18 = sub_0202C8C4(v0->wiFiHistory);
v0->unk_1C = v1->unk_08;
ov69_0225D2A8(v0, v1);
ov69_0225D318(&v0->unk_20, v0->unk_10, HEAP_ID_105);
ov69_0225D318(&v0->unk_20, v0->options, HEAP_ID_105);
ov69_0225D6D8(&v0->unk_1DC, &v0->unk_20, HEAP_ID_105);
ov69_0225EF1C(&v0->unk_1CC, HEAP_ID_105);
ov69_0225D7A0(&v0->unk_288, v1->unk_00, &v0->unk_20, v0->unk_04, HEAP_ID_105);
@ -1359,14 +1359,14 @@ static void ov69_0225D2A8(UnkStruct_ov69_0225CE64 *param0, const UnkStruct_ov66_
}
}
static void ov69_0225D318(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 heapID)
static void ov69_0225D318(UnkStruct_ov69_0225D35C *param0, Options *options, u32 heapID)
{
param0->unk_1A8 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTIMER, heapID);
VramTransfer_New(64, heapID);
GXLayers_SetBanks(&Unk_ov69_0225F0C0);
ov69_0225D3A4(param0, param1, heapID);
ov69_0225D3A4(param0, options, heapID);
ov69_0225D53C(param0, heapID);
ov69_0225D604(param0, heapID);
}
@ -1393,7 +1393,7 @@ static void ov69_0225D390(UnkStruct_ov69_0225D35C *param0)
VramTransfer_Process();
}
static void ov69_0225D3A4(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 heapID)
static void ov69_0225D3A4(UnkStruct_ov69_0225D35C *param0, Options *options, u32 heapID)
{
SetAllGraphicsModes(&Unk_ov69_0225F040);
@ -1402,37 +1402,30 @@ static void ov69_0225D3A4(UnkStruct_ov69_0225D35C *param0, Options *param1, u32
GXLayers_SwapDisplay();
int v0;
int i;
for (v0 = 0; v0 < 5; v0++) {
Bg_InitFromTemplate(param0->unk_00, Unk_ov69_0225F060[v0], &Unk_ov69_0225F154[v0], 0);
Bg_ClearTilesRange(Unk_ov69_0225F060[v0], 32, 0, heapID);
Bg_ClearTilemap(param0->unk_00, Unk_ov69_0225F060[v0]);
for (i = 0; i < 5; i++) {
Bg_InitFromTemplate(param0->unk_00, Unk_ov69_0225F060[i], &Unk_ov69_0225F154[i], 0);
Bg_ClearTilesRange(Unk_ov69_0225F060[i], 32, 0, heapID);
Bg_ClearTilemap(param0->unk_00, Unk_ov69_0225F060[i]);
}
Graphics_LoadPaletteFromOpenNARC(param0->unk_1A8, 5, 4, 0, 0, heapID);
{
Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_1A8, 11, param0->unk_00, 4, 0, 0, 0, heapID);
Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A8, 12, param0->unk_00, 4, 0, 0, 0, heapID);
}
{
Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_1A8, 4, param0->unk_00, 6, 0, 0, 0, heapID);
Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A8, 18, param0->unk_00, 7, 0, 0, 0, heapID);
}
Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_1A8, 11, param0->unk_00, 4, 0, 0, 0, heapID);
Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A8, 12, param0->unk_00, 4, 0, 0, 0, heapID);
Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_1A8, 4, param0->unk_00, 6, 0, 0, 0, heapID);
Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A8, 18, param0->unk_00, 7, 0, 0, 0, heapID);
Font_LoadScreenIndicatorsPalette(0, 1 * 0x20, heapID);
Font_LoadScreenIndicatorsPalette(4, 11 * 0x20, heapID);
LoadStandardWindowGraphics(param0->unk_00, 1, (1 + (18 + 12)), 0, 0, heapID);
LoadStandardWindowGraphics(param0->unk_00, 1, (1 + (18 + 12)), 0, 0, heapID);
{
u8 v1 = Options_Frame(param1);
u8 v1 = Options_Frame(options);
LoadMessageBoxGraphics(param0->unk_00, 4, 10, 10, v1, heapID);
LoadMessageBoxGraphics(param0->unk_00, 1, 1, 2, v1, heapID);
}
LoadMessageBoxGraphics(param0->unk_00, 4, 10, 10, v1, heapID);
LoadMessageBoxGraphics(param0->unk_00, 1, 1, 2, v1, heapID);
Bg_MaskPalette(0, 0x72ca);
}
@ -1918,13 +1911,7 @@ static void ov69_0225DD60(UnkStruct_ov69_0225DDC8 *param0, UnkStruct_ov69_0225D3
{
memset(param0, 0, sizeof(UnkStruct_ov69_0225DC48));
{
Options *v0;
v0 = SaveData_GetOptions(saveData);
param0->unk_08 = Options_TextFrameDelay(v0);
}
param0->unk_08 = Options_TextFrameDelay(SaveData_GetOptions(saveData));
param0->unk_0C = Strbuf_Init(128, heapID);
Window_Add(param1->unk_00, &param0->unk_10, 1, 2, 1, 27, 4, 1, (((1 + (18 + 12)) + 9) + (6 * 2)));

15
src/overlay070/ov70_0225D9A4.c
View File

@ -1277,11 +1277,8 @@ static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *saveData, u
}
{
Options *v1;
u8 v2;
v1 = SaveData_GetOptions(saveData);
v2 = Options_Frame(v1);
Options *options = SaveData_GetOptions(saveData);
u8 v2 = Options_Frame(options);
Font_LoadTextPalette(0, 5 * 32, heapID);
Font_LoadScreenIndicatorsPalette(0, 4 * 32, heapID);
@ -1508,13 +1505,7 @@ static void ov70_0225E9C8(UnkStruct_ov70_0225E9C8 *param0, UnkStruct_ov70_0225E4
Window_FillTilemap(&param0->unk_00, 15);
param0->unk_18 = Strbuf_Init(384, heapID);
{
Options *v0;
v0 = SaveData_GetOptions(saveData);
param0->unk_14 = Options_TextFrameDelay(v0);
}
param0->unk_14 = Options_TextFrameDelay(SaveData_GetOptions(saveData));
}
static void ov70_0225EA14(UnkStruct_ov70_0225E9C8 *param0)

6
src/overlay072/ov72_0223D7A0.c
View File

@ -139,7 +139,7 @@ int ov72_0223D7A0(ApplicationManager *appMan, int *param1)
v0->unk_5BFC = (u8 *)sub_0202C840(sub_0202C834(saveData));
v0->records = (GameRecords *)SaveData_GetGameRecords((SaveData *)ApplicationManager_Args(appMan));
v0->unk_0C = (Options *)SaveData_GetOptions((SaveData *)ApplicationManager_Args(appMan));
v0->options = SaveData_GetOptions((SaveData *)ApplicationManager_Args(appMan));
}
ov72_0223DCA8(v0, v1);
@ -449,7 +449,7 @@ static void ov72_0223DCA8(UnkStruct_ov72_0223DB98 *param0, NARC *param1)
Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 5, v0, 2, 0, 32 * 24 * 2, 1, HEAP_ID_39);
Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 4, v0, 5, 0, 32 * 8 * 0x20, 1, HEAP_ID_39);
Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 6, v0, 5, 0, 32 * 24 * 2, 1, HEAP_ID_39);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_0C), HEAP_ID_39);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->options), HEAP_ID_39);
LoadStandardWindowGraphics(v0, 0, 1 + (18 + 12), 11, 0, HEAP_ID_39);
}
@ -1103,7 +1103,7 @@ static void ov72_0223E930(UnkStruct_ov72_0223DB98 *param0, int param1)
Window_FillTilemap(&param0->unk_338, 0xf0f);
Window_DrawMessageBoxWithScrollCursor(&param0->unk_338, 0, 1, 10);
param0->unk_38 = Text_AddPrinterWithParams(&param0->unk_338, FONT_MESSAGE, param0->unk_34, 0, 0, Options_TextFrameDelay(param0->unk_0C), NULL);
param0->unk_38 = Text_AddPrinterWithParams(&param0->unk_338, FONT_MESSAGE, param0->unk_34, 0, 0, Options_TextFrameDelay(param0->options), NULL);
}
static int ov72_0223E99C(int param0)

10
src/overlay073/ov73_021D0D80.c
View File

@ -49,7 +49,7 @@ FS_EXTERN_OVERLAY(game_start);
typedef struct {
int heapID;
SaveData *saveData;
Options *unk_08;
Options *options;
int unk_0C;
int unk_10;
ApplicationManager *appMan;
@ -136,12 +136,12 @@ int ov73_021D0D80(ApplicationManager *appMan, int *param1)
v0->heapID = childHeapID;
v0->saveData = ((ApplicationArgs *)ApplicationManager_Args(appMan))->saveData;
v0->unk_08 = SaveData_GetOptions(v0->saveData);
v0->options = SaveData_GetOptions(v0->saveData);
v0->unk_0C = 0;
v0->unk_10 = 0;
v0->appMan = NULL;
v0->unk_70 = sub_0208712C(childHeapID, 0, 0, 7, v0->unk_08);
v0->unk_74 = sub_0208712C(childHeapID, 3, 0, 7, v0->unk_08);
v0->unk_70 = sub_0208712C(childHeapID, 0, 0, 7, v0->options);
v0->unk_74 = sub_0208712C(childHeapID, 3, 0, 7, v0->options);
v0->unk_88 = 0;
v0->unk_89 = 0;
v0->unk_8A = 0;
@ -712,7 +712,7 @@ static BOOL ov73_021D1510(UnkStruct_ov73_021D1058 *param0, u32 param1, int param
Strbuf_Free(v1);
}
param0->unk_58 = Text_AddPrinterWithParams(&param0->unk_1C, FONT_MESSAGE, param0->unk_5C, 0, 0, (Options_TextFrameDelay(param0->unk_08)), NULL);
param0->unk_58 = Text_AddPrinterWithParams(&param0->unk_1C, FONT_MESSAGE, param0->unk_5C, 0, 0, (Options_TextFrameDelay(param0->options)), NULL);
param0->unk_50 = 1;
break;
case 1:

4
src/overlay079/ov79_021D0D80.c
View File

@ -650,7 +650,7 @@ static void ov79_021D14A4(UnkStruct_ov79_021D0E1C *param0)
};
LoadStandardWindowGraphics(param0->unk_24, 1, 1 + 18 + 12, 15, 0, param0->heapID);
LoadMessageBoxGraphics(param0->unk_24, 1, 1, 14, Options_Frame(param0->unk_20->unk_18), param0->heapID);
LoadMessageBoxGraphics(param0->unk_24, 1, 1, 14, Options_Frame(param0->unk_20->options), param0->heapID);
Font_LoadTextPalette(0, 13 * 32, param0->heapID);
Font_LoadScreenIndicatorsPalette(0, 12 * 32, param0->heapID);
Font_LoadTextPalette(4, 13 * 32, param0->heapID);
@ -700,7 +700,7 @@ static void ov79_021D1568(UnkStruct_ov79_021D0E1C *param0)
param0->unk_30.unk_38[v0] = MessageLoader_GetNewStrbuf(param0->unk_2C, 17 + v0);
}
param0->unk_30.unk_4C = Options_TextFrameDelay(param0->unk_20->unk_18);
param0->unk_30.unk_4C = Options_TextFrameDelay(param0->unk_20->options);
}
static void ov79_021D1618(UnkStruct_ov79_021D0E1C *param0)

4
src/overlay084/ov84_0223B5A0.c
View File

@ -598,7 +598,7 @@ static void ov84_0223B9AC(UnkStruct_ov84_0223B5A0 *param0)
{
param0->unk_C8 = SaveData_GetBag(param0->unk_C4->saveData);
param0->unk_CC = SaveData_GetTrainerInfo(param0->unk_C4->saveData);
param0->unk_D0 = SaveData_GetOptions(param0->unk_C4->saveData);
param0->options = SaveData_GetOptions(param0->unk_C4->saveData);
}
static SpecialEncounter *ov84_0223B9E4(UnkStruct_ov84_0223B5A0 *param0)
@ -818,7 +818,7 @@ static void ov84_0223BC1C(UnkStruct_ov84_0223B5A0 *param0)
Graphics_LoadPaletteFromOpenNARC(param0->unk_D4, 22, 0, 16 * 13 * 2, 32, HEAP_ID_6);
Font_LoadScreenIndicatorsPalette(0, 11 * 32, HEAP_ID_6);
LoadStandardWindowGraphics(param0->unk_00, 0, 1024 - 9, 14, 0, HEAP_ID_6);
LoadMessageBoxGraphics(param0->unk_00, 0, 1024 - 9 - (18 + 12), 12, Options_Frame(param0->unk_D0), HEAP_ID_6);
LoadMessageBoxGraphics(param0->unk_00, 0, 1024 - 9 - (18 + 12), 12, Options_Frame(param0->options), HEAP_ID_6);
Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_D4, 15, param0->unk_00, 5, 0, 0, 0, HEAP_ID_6);
Graphics_LoadPaletteFromOpenNARC(param0->unk_D4, 16, 4, 0, 0, HEAP_ID_6);
Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_D4, 17, param0->unk_00, 5, 0, 0, 0, HEAP_ID_6);

2
src/overlay084/ov84_0223F040.c
View File

@ -580,7 +580,7 @@ u8 ov84_022400A0(UnkStruct_ov84_0223B5A0 *param0)
RenderControlFlags_SetCanABSpeedUpPrint(1);
RenderControlFlags_SetAutoScrollFlags(0);
v0 = Text_AddPrinterWithParams(&param0->unk_04[6], FONT_MESSAGE, param0->unk_3F8, 0, 0, Options_TextFrameDelay(param0->unk_D0), ov84_022400E0);
v0 = Text_AddPrinterWithParams(&param0->unk_04[6], FONT_MESSAGE, param0->unk_3F8, 0, 0, Options_TextFrameDelay(param0->options), ov84_022400E0);
return v0;
}

6
src/overlay088/ov88_0223B140.c
View File

@ -305,7 +305,7 @@ int ov88_0223B140(ApplicationManager *appMan, int *param1)
ov88_0223C63C();
ov88_0223C66C(v0, v1);
ov88_0223CBA0(v0);
ov88_0223E9C4(v0->unk_174, v0->unk_49C, v0->unk_08->unk_18);
ov88_0223E9C4(v0->unk_174, v0->unk_49C, v0->unk_08->options);
v0->fieldSystem = v0->unk_08->fieldSystem;
@ -368,7 +368,7 @@ static void ov88_0223B3C0(UnkStruct_02095E80 *param0)
ov88_0223B4F0(param0);
ov88_0223B320(param0);
LoadMessageBoxGraphics(param0->unk_174, 0, (512 - (9 + (18 + 12))), 10, Options_Frame(param0->unk_08->unk_18), HEAP_ID_26);
LoadMessageBoxGraphics(param0->unk_174, 0, (512 - (9 + (18 + 12))), 10, Options_Frame(param0->unk_08->options), HEAP_ID_26);
LoadStandardWindowGraphics(param0->unk_174, 0, (512 - 9), 11, 0, HEAP_ID_26);
ov88_0223ECBC(&param0->unk_49C[21], 15, FONT_MESSAGE, param0->unk_184, param0->unk_178);
@ -1730,7 +1730,7 @@ static void ov88_0223D1EC(UnkStruct_02095E80 *param0, int param1)
param0->unk_0C.move = 0;
param0->unk_0C.showContest = PokemonSummaryScreen_ShowContestData(param0->unk_08->saveData);
param0->unk_0C.dexMode = param0->unk_08->unk_30;
param0->unk_0C.options = param0->unk_08->unk_18;
param0->unk_0C.options = param0->unk_08->options;
param0->unk_0C.specialRibbons = sub_0202D79C(param0->unk_08->saveData);
PokemonSummaryScreen_FlagVisiblePages(&param0->unk_0C, Unk_ov88_0223F13C);

4
src/overlay088/ov88_0223E9C4.c
View File

@ -46,7 +46,7 @@ static const u16 Unk_ov88_0223F170[][2] = {
{ 0x14, 0xA }
};
void ov88_0223E9C4(BgConfig *param0, Window *param1, Options *param2)
void ov88_0223E9C4(BgConfig *param0, Window *param1, Options *options)
{
int v0;
@ -59,7 +59,7 @@ void ov88_0223E9C4(BgConfig *param0, Window *param1, Options *param2)
Window_Add(param0, &param1[6], 1, 26, 21, 5, 2, 8, ((1 + (10 * 2)) + (10 * 2)));
Window_FillTilemap(&param1[6], 0);
LoadMessageBoxGraphics(param0, 0, (512 - (9 + (18 + 12))), 10, Options_Frame(param2), HEAP_ID_26);
LoadMessageBoxGraphics(param0, 0, (512 - (9 + (18 + 12))), 10, Options_Frame(options), HEAP_ID_26);
LoadStandardWindowGraphics(param0, 0, (512 - 9), 11, 0, HEAP_ID_26);
Window_Add(param0, &param1[21], 0, 2, 21, 20, 2, 13, 1);

4
src/overlay090/ov90_021D0D80.c
View File

@ -73,7 +73,7 @@ typedef struct {
u8 unk_0F;
BgConfig *unk_10;
UnkStruct_ov90_021D0D80 *unk_14;
Options *unk_18;
Options *options;
BattleFrontier *frontier;
UnkStruct_0202D750 *unk_20;
UnkStruct_0202D764 *unk_24;
@ -126,7 +126,7 @@ int ov90_021D0D80(ApplicationManager *appMan, int *param1)
v0->unk_08 = v1->unk_04;
v0->unk_0A = v1->unk_06;
v0->unk_18 = SaveData_GetOptions(v1->saveData);
v0->options = SaveData_GetOptions(v1->saveData);
v0->frontier = SaveData_GetBattleFrontier(v1->saveData);
v0->unk_20 = sub_0202D750(v1->saveData);
v0->unk_24 = sub_0202D764(v1->saveData);

6
src/overlay091/ov91_021D0D80.c
View File

@ -596,7 +596,7 @@ static void ov91_021D10C8(UnkStruct_ov91_021D0ED8 *param0, NARC *param1)
Graphics_LoadPaletteFromOpenNARC(param1, 12, 0, 0, 0, HEAP_ID_67);
Font_LoadScreenIndicatorsPalette(0, 14 * 32, HEAP_ID_67);
LoadStandardWindowGraphics(param0->unk_04, 0, 1, 12, 0, HEAP_ID_67);
LoadMessageBoxGraphics(param0->unk_04, 0, (1 + 9), 13, Options_Frame(param0->unk_00->unk_08), HEAP_ID_67);
LoadMessageBoxGraphics(param0->unk_04, 0, (1 + 9), 13, Options_Frame(param0->unk_00->options), HEAP_ID_67);
}
static void ov91_021D1154(UnkStruct_ov91_021D0ED8 *param0)
@ -1139,7 +1139,7 @@ static void ov91_021D1DF8(UnkStruct_ov91_021D0ED8 *param0, u32 param1)
RenderControlFlags_SetCanABSpeedUpPrint(1);
RenderControlFlags_SetAutoScrollFlags(0);
param0->unk_185 = Text_AddPrinterWithParams(&param0->unk_08[12], FONT_MESSAGE, param0->unk_100, 0, 0, Options_TextFrameDelay(param0->unk_00->unk_08), ov91_021D1E50);
param0->unk_185 = Text_AddPrinterWithParams(&param0->unk_08[12], FONT_MESSAGE, param0->unk_100, 0, 0, Options_TextFrameDelay(param0->unk_00->options), ov91_021D1E50);
}
static BOOL ov91_021D1E50(TextPrinterTemplate *param0, u16 param1)
@ -1496,7 +1496,7 @@ static int ov91_021D261C(UnkStruct_ov91_021D0ED8 *param0)
ov91_021D0F6C(param0);
param0->unk_14C.monData = param0->unk_00->unk_00;
param0->unk_14C.options = param0->unk_00->unk_08;
param0->unk_14C.options = param0->unk_00->options;
param0->unk_14C.dataType = SUMMARY_DATA_MON;
param0->unk_14C.monIndex = 0;
param0->unk_14C.monMax = 1;

20
src/overlay092/ov92_021D0D80.c
View File

@ -67,7 +67,7 @@ typedef struct {
typedef struct {
int heapID;
WiFiHistory *wiFiHistory;
Options *unk_08;
Options *options;
UnkStruct_ov92_021D1B24_sub1 unk_0C;
BgConfig *unk_B810;
Window unk_B814;
@ -323,15 +323,13 @@ int ov92_021D0D80(ApplicationManager *appMan, int *param1)
v0->unk_BAF0 = 0;
}
{
SaveData *saveData = ApplicationManager_Args(appMan);
SaveData *saveData = ApplicationManager_Args(appMan);
v0->wiFiHistory = SaveData_WiFiHistory(saveData);
v0->unk_BB14 = WiFiHistory_GetCountry(v0->wiFiHistory);
v0->unk_BB18 = sub_0202C8C4(v0->wiFiHistory);
v0->unk_BB24 = sub_0202C990(v0->wiFiHistory);
v0->unk_08 = SaveData_GetOptions(saveData);
}
v0->wiFiHistory = SaveData_WiFiHistory(saveData);
v0->unk_BB14 = WiFiHistory_GetCountry(v0->wiFiHistory);
v0->unk_BB18 = sub_0202C8C4(v0->wiFiHistory);
v0->unk_BB24 = sub_0202C990(v0->wiFiHistory);
v0->options = SaveData_GetOptions(saveData);
ov92_021D14F0();
ov92_021D1510();
@ -917,7 +915,7 @@ static void ov92_021D1888(UnkStruct_ov92_021D1B24 *param0, NARC *param1)
Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 5, param0->unk_B810, 7, 0, 0, 0, param0->heapID);
Graphics_LoadPaletteFromOpenNARC(param1, 6, 4, 0 * (2 * 16), (2 * 16) * 4, param0->heapID);
Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 7, param0->unk_B810, 7, 0, 0, 0, param0->heapID);
LoadMessageBoxGraphics(param0->unk_B810, 6, (512 - (18 + 12)), 6, Options_Frame(param0->unk_08), param0->heapID);
LoadMessageBoxGraphics(param0->unk_B810, 6, (512 - (18 + 12)), 6, Options_Frame(param0->options), param0->heapID);
LoadStandardWindowGraphics(param0->unk_B810, 6, ((512 - (18 + 12)) - 9), 7, 0, param0->heapID);
Font_LoadTextPalette(4, 4 * (2 * 16), param0->heapID);
Bg_ClearTilesRange(6, 32, 0, param0->heapID);
@ -990,7 +988,7 @@ static BOOL ov92_021D1B70(UnkStruct_ov92_021D1B24 *param0, u32 param1, int param
Window_FillRectWithColor(&param0->unk_B814, 15, 0, 0, 27 * 8, 4 * 8);
param0->unk_B86C = Strbuf_Init(0x400, param0->heapID);
MessageLoader_GetStrbuf(param0->unk_B860, param1, param0->unk_B86C);
param0->unk_B868 = Text_AddPrinterWithParams(&param0->unk_B814, FONT_MESSAGE, param0->unk_B86C, 0, 0, Options_TextFrameDelay(param0->unk_08), NULL);
param0->unk_B868 = Text_AddPrinterWithParams(&param0->unk_B814, FONT_MESSAGE, param0->unk_B86C, 0, 0, Options_TextFrameDelay(param0->options), NULL);
param0->unk_B864 = 1;
break;
case 1:

2
src/overlay094/ov94_0223BCB0.c
View File

@ -485,7 +485,7 @@ void ov94_0223C4C8(UnkStruct_ov94_0223FD4C *param0)
int ov94_0223C4D4(UnkStruct_ov94_0223FD4C *param0)
{
return Options_TextFrameDelay(param0->unk_00->unk_24);
return Options_TextFrameDelay(param0->unk_00->options);
}
static void ov94_0223C4E0(UnkStruct_ov94_0223FD4C *param0)

2
src/overlay094/ov94_0223C610.c
View File

@ -276,7 +276,7 @@ static void ov94_0223C888(UnkStruct_ov94_0223FD4C *param0)
Graphics_LoadPaletteFromOpenNARC(v1, 4, 0, 0, 16 * 3 * 2, HEAP_ID_62);
Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, HEAP_ID_62);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), HEAP_ID_62);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_00->options), HEAP_ID_62);
LoadStandardWindowGraphics(v0, 0, (1 + (18 + 12)), 11, 0, HEAP_ID_62);
Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 14, v0, 1, 0, 16 * 6 * 0x20, 1, HEAP_ID_62);
Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 30, v0, 1, 0, 32 * 24 * 2, 1, HEAP_ID_62);

2
src/overlay094/ov94_0223D0C4.c
View File

@ -235,7 +235,7 @@ static void ov94_0223D2E8(UnkStruct_ov94_0223FD4C *param0)
Graphics_LoadPaletteFromOpenNARC(v1, 7, 0, 0, 16 * 3 * 2, HEAP_ID_62);
Graphics_LoadPaletteFromOpenNARC(v1, 5, 4, 0, 16 * 8 * 2, HEAP_ID_62);
Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, HEAP_ID_62);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), HEAP_ID_62);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_00->options), HEAP_ID_62);
LoadStandardWindowGraphics(v0, 0, (1 + (18 + 12)), 11, 0, HEAP_ID_62);
Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 17, v0, 1, 0, 16 * 5 * 0x20, 1, HEAP_ID_62);
Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 25, v0, 1, 0, 32 * 24 * 2, 1, HEAP_ID_62);

2
src/overlay094/ov94_0223DC04.c
View File

@ -205,7 +205,7 @@ static void ov94_0223DE04(UnkStruct_ov94_0223FD4C *param0)
BgConfig *v0 = param0->unk_04;
Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, HEAP_ID_62);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), HEAP_ID_62);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_00->options), HEAP_ID_62);
LoadStandardWindowGraphics(v0, 0, (1 + (18 + 12)), 11, 0, HEAP_ID_62);
Graphics_LoadTilesToBgLayer(104, 17, v0, 1, 0, 16 * 5 * 0x20, 1, HEAP_ID_62);
Graphics_LoadPalette(104, 7, 0, 0, 16 * 3 * 2, HEAP_ID_62);

2
src/overlay094/ov94_0223E46C.c
View File

@ -276,7 +276,7 @@ static void ov94_0223E6B8(UnkStruct_ov94_0223FD4C *param0)
Graphics_LoadPaletteFromOpenNARC(v1, 3, 0, 0, 16 * 3 * 2, HEAP_ID_62);
Graphics_LoadPaletteFromOpenNARC(v1, 5, 4, 0, 16 * 8 * 2, HEAP_ID_62);
Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, HEAP_ID_62);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), HEAP_ID_62);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_00->options), HEAP_ID_62);
LoadStandardWindowGraphics(v0, 0, (1 + (18 + 12)), 11, 0, HEAP_ID_62);
Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 13, v0, 1, 0, 16 * 5 * 0x20, 1, HEAP_ID_62);
Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 26, v0, 1, 0, 32 * 24 * 2, 1, HEAP_ID_62);

2
src/overlay094/ov94_0223FB48.c
View File

@ -299,7 +299,7 @@ static void ov94_0223FD4C(UnkStruct_ov94_0223FD4C *param0)
Graphics_LoadPaletteFromOpenNARC(v1, 2, 0, 0, 16 * 3 * 2, HEAP_ID_62);
Graphics_LoadPaletteFromOpenNARC(v1, 5, 4, 0, 16 * 8 * 2, HEAP_ID_62);
Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, HEAP_ID_62);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), HEAP_ID_62);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_00->options), HEAP_ID_62);
LoadStandardWindowGraphics(v0, 0, (1 + (18 + 12)), 11, 0, HEAP_ID_62);
Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 12, v0, 1, 0, 16 * 5 * 0x20, 1, HEAP_ID_62);
Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 24, v0, 1, 0, 32 * 24 * 2, 1, HEAP_ID_62);

2
src/overlay094/ov94_022414B8.c
View File

@ -454,7 +454,7 @@ static void ov94_0224170C(UnkStruct_ov94_0223FD4C *param0)
Graphics_LoadPalette(104, 1, 0, 0, 16 * 3 * 2, HEAP_ID_62);
Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, HEAP_ID_62);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), HEAP_ID_62);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_00->options), HEAP_ID_62);
LoadStandardWindowGraphics(v0, 0, (1 + (18 + 12)), 11, 0, HEAP_ID_62);
Graphics_LoadTilesToBgLayer(104, 11, v0, 1, 0, 16 * 5 * 0x20, 1, HEAP_ID_62);
Graphics_LoadTilemapToBgLayer(104, 23, v0, 1, 0, 32 * 24 * 2, 1, HEAP_ID_62);

2
src/overlay094/ov94_02242AD0.c
View File

@ -329,7 +329,7 @@ static void ov94_02242CAC(UnkStruct_ov94_0223FD4C *param0)
Graphics_LoadPalette(104, 0, 0, 0, 16 * 3 * 2, HEAP_ID_62);
Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, HEAP_ID_62);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), HEAP_ID_62);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_00->options), HEAP_ID_62);
LoadStandardWindowGraphics(v0, 0, (1 + (18 + 12)), 11, 0, HEAP_ID_62);
if (param0->unk_10F0 == 0) {

2
src/overlay094/ov94_022443E0.c
View File

@ -36,7 +36,7 @@ int ov94_022443E0(UnkStruct_ov94_0223FD4C *param0, int param1)
param0->unk_B8.move = 0;
param0->unk_B8.showContest = PokemonSummaryScreen_ShowContestData(param0->unk_00->saveData);
param0->unk_B8.dexMode = param0->unk_00->unk_34;
param0->unk_B8.options = param0->unk_00->unk_24;
param0->unk_B8.options = param0->unk_00->options;
param0->unk_B8.specialRibbons = sub_0202D79C(param0->unk_00->saveData);
PokemonSummaryScreen_FlagVisiblePages(&param0->unk_B8, Unk_ov94_02246360);

6
src/overlay094/ov94_022444C8.c
View File

@ -73,7 +73,7 @@ int ov94_022444C8(UnkStruct_ov94_0223FD4C *param0, int param1)
break;
}
param0->unk_E8.unk_14 = param0->unk_00->unk_24;
param0->unk_E8.options = param0->unk_00->options;
param0->appMan = ApplicationManager_New(&Unk_ov94_0224636C, &param0->unk_E8, 62);
param0->unk_104 = 1;
@ -98,7 +98,7 @@ int ov94_02244678(UnkStruct_ov94_0223FD4C *param0, int param1)
v3 = Pokemon_GetEvolutionTargetSpecies(NULL, v1, EVO_CLASS_BY_TRADE, v2, &v4);
if (v3 != 0) {
param0->unk_100 = sub_0207AE68(NULL, v1, v3, param0->unk_00->unk_24, param0->unk_00->unk_3C, param0->unk_00->unk_10, param0->unk_00->unk_30, param0->unk_00->records, SaveData_GetPoketch(param0->unk_00->saveData), v4, 0x4, HEAP_ID_62);
param0->unk_100 = sub_0207AE68(NULL, v1, v3, param0->unk_00->options, param0->unk_00->unk_3C, param0->unk_00->unk_10, param0->unk_00->unk_30, param0->unk_00->records, SaveData_GetPoketch(param0->unk_00->saveData), v4, 0x4, HEAP_ID_62);
param0->unk_2C = 1;
} else {
ov94_0223C4C0(param0, 1, 0);
@ -118,7 +118,7 @@ int ov94_02244678(UnkStruct_ov94_0223FD4C *param0, int param1)
v7 = Pokemon_GetEvolutionTargetSpecies(NULL, v1, EVO_CLASS_BY_TRADE, v6, &v8);
if (v7 != 0) {
param0->unk_100 = sub_0207AE68(NULL, v1, v7, param0->unk_00->unk_24, param0->unk_00->unk_3C, param0->unk_00->unk_10, param0->unk_00->unk_30, param0->unk_00->records, SaveData_GetPoketch(param0->unk_00->saveData), v8, 0x4, HEAP_ID_62);
param0->unk_100 = sub_0207AE68(NULL, v1, v7, param0->unk_00->options, param0->unk_00->unk_3C, param0->unk_00->unk_10, param0->unk_00->unk_30, param0->unk_00->records, SaveData_GetPoketch(param0->unk_00->saveData), v8, 0x4, HEAP_ID_62);
param0->unk_2C = 1;
} else {
ov94_0223C4C0(param0, 1, 0);

2
src/overlay094/ov94_02244950.c
View File

@ -274,7 +274,7 @@ static void ov94_02244B8C(UnkStruct_ov94_0223FD4C *param0)
Graphics_LoadPaletteFromOpenNARC(v1, 3, 4, 0, 0, HEAP_ID_62);
Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, HEAP_ID_62);
Font_LoadScreenIndicatorsPalette(4, 13 * 0x20, HEAP_ID_62);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), HEAP_ID_62);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_00->options), HEAP_ID_62);
LoadStandardWindowGraphics(v0, 0, (1 + (18 + 12)), 11, 0, HEAP_ID_62);
Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 2, v0, 1, 0, 0, 0, HEAP_ID_62);
Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 5, v0, 1, 0, 32 * 24 * 2, 0, HEAP_ID_62);

2
src/overlay095/ov95_02246C20.c
View File

@ -718,7 +718,7 @@ u16 ov95_02247668(UnkStruct_ov95_02247628 *param0)
int ov95_02247674(UnkStruct_ov95_02247628 *param0)
{
return Options_Frame(param0->unk_00->unk_14);
return Options_Frame(param0->unk_00->options);
}
int ov95_02247680(UnkStruct_ov95_02247628 *param0)

2
src/overlay096/ov96_0223BCE0.c
View File

@ -355,7 +355,7 @@ static void ov96_0223BF40(UnkStruct_ov96_0223BF40 *param0)
Graphics_LoadPaletteFromOpenNARC(v1, 3, 4, 0, 0, HEAP_ID_68);
Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, HEAP_ID_68);
Font_LoadScreenIndicatorsPalette(4, 13 * 0x20, HEAP_ID_68);
LoadMessageBoxGraphics(v0, 0, 1, 14, Options_Frame(param0->unk_00->unk_10), HEAP_ID_68);
LoadMessageBoxGraphics(v0, 0, 1, 14, Options_Frame(param0->unk_00->options), HEAP_ID_68);
LoadStandardWindowGraphics(v0, 0, (1 + (18 + 12)), 11, 0, HEAP_ID_68);
Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 2, v0, 1, 0, 0, 0, HEAP_ID_68);
Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 5, v0, 1, 0, 32 * 24 * 2, 0, HEAP_ID_68);

6
src/overlay097/ov97_0222C174.c
View File

@ -348,7 +348,7 @@ typedef struct {
SaveData *saveData;
Pokedex *unk_0C;
TrainerInfo *unk_10;
Options *unk_14;
Options *options;
Window unk_18;
Window unk_28;
Window unk_38;
@ -538,7 +538,7 @@ static void ov97_0222C254(UnkStruct_ov97_0222C388 *param0)
Font_LoadTextPalette(0, 0 * 32, param0->heapID);
LoadStandardWindowGraphics(param0->unk_04, 0, 1, 1, 0, param0->heapID);
v0 = Options_Frame(param0->unk_14);
v0 = Options_Frame(param0->options);
LoadMessageBoxGraphics(param0->unk_04, 0, (1 + 9), 2, v0, param0->heapID);
Graphics_LoadPalette(116, 0, 0, 16 * 2 * 8, 16 * 2, param0->heapID);
@ -673,7 +673,7 @@ static int ov97_0222C6F8(ApplicationManager *appMan, int *param1)
v0->saveData = ((ApplicationArgs *)ApplicationManager_Args(appMan))->saveData;
v0->unk_10 = SaveData_GetTrainerInfo(v0->saveData);
v0->unk_0C = SaveData_GetPokedex(v0->saveData);
v0->unk_14 = SaveData_GetOptions(v0->saveData);
v0->options = SaveData_GetOptions(v0->saveData);
ov97_02237694(v0->heapID);

2
src/overlay098/ov98_02246C20.c
View File

@ -104,7 +104,7 @@ int ov98_02246C20(ApplicationManager *appMan, int *param1)
v0 = ApplicationManager_NewData(appMan, sizeof(UnkStruct_ov98_02246E88), HEAP_ID_108);
MI_CpuClear8(v0, sizeof(UnkStruct_ov98_02246E88));
v0->saveData = ((ApplicationArgs *)ApplicationManager_Args(appMan))->saveData;
v0->unk_08 = SaveData_GetOptions(v0->saveData);
v0->options = SaveData_GetOptions(v0->saveData);
v0->unk_114 = Strbuf_Init(100, HEAP_ID_108);
v0->unk_118 = Strbuf_Init(100, HEAP_ID_108);
Sound_SetSceneAndPlayBGM(SOUND_SCENE_17, SEQ_WIFILOBBY, 1);

2
src/overlay098/ov98_022471C8.c
View File

@ -624,7 +624,7 @@ static void ov98_02247704(UnkStruct_ov98_02247704 *param0)
Graphics_LoadPaletteFromOpenNARC(v1, 3, 4, 0, 0, HEAP_ID_109);
Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, HEAP_ID_109);
Font_LoadScreenIndicatorsPalette(4, 13 * 0x20, HEAP_ID_109);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_08), HEAP_ID_109);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_00->options), HEAP_ID_109);
LoadStandardWindowGraphics(v0, 0, (1 + (18 + 12)), 11, 0, HEAP_ID_109);
LoadStandardWindowGraphics(v0, 2, (1 + (18 + 12)), 11, 0, HEAP_ID_109);
Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 2, v0, 1, 0, 0, 0, HEAP_ID_109);

2
src/overlay100/ov100_021D0D80.c
View File

@ -66,7 +66,7 @@ int ov100_021D0D80(ApplicationManager *appMan, int *param1)
{
Window *v1 = &v0->unk_0C.unk_30;
int v2 = Options_Frame(v0->unk_D0->unk_04);
int v2 = Options_Frame(v0->unk_D0->options);
Window_Init(v1);
Window_Add(v0->unk_0C.unk_0C, v1, 1, 2, 19, 27, 4, 14, 1);

2
src/overlay100/ov100_021D46C8.c
View File

@ -49,7 +49,7 @@ int ov100_021D46C8(UnkStruct_ov100_021D46C8 *param0, UnkStruct_020985E4 *param1,
Strbuf_Copy(v3, v2);
}
v4 = Options_TextFrameDelay(param1->unk_04);
v4 = Options_TextFrameDelay(param1->options);
Window_FillTilemap(&param0->unk_30, 0xFF);
v0 = Text_AddPrinterWithParams(&param0->unk_30, FONT_MESSAGE, v3, 0, 0, v4, NULL);

18
src/overlay105/ov105_02241AE0.c
View File

@ -103,7 +103,7 @@ struct UnkStruct_ov105_02241FF4_t {
GenericPointerData *unk_124;
PokemonSpriteManager *unk_128;
PokemonSprite *unk_12C[3];
Options *unk_138;
Options *options;
SaveData *saveData;
PokemonSummary *unk_140;
UnkStruct_ov105_02245AAC unk_144;
@ -370,7 +370,7 @@ int ov105_02241AE0(ApplicationManager *appMan, int *param1)
v1->unk_31C = v2->unk_08;
v1->unk_320 = v2->unk_0C;
v1->unk_330 = &v2->unk_10[0];
v1->unk_138 = SaveData_GetOptions(v1->saveData);
v1->options = SaveData_GetOptions(v1->saveData);
v1->unk_14 = (4 * 2);
if (ov105_022454F8(v1, 0) == 1) {
@ -753,7 +753,7 @@ static void ov105_0224227C(UnkStruct_ov105_02241FF4 *param0)
}
ov105_02244FF8(param0, &param0->unk_50[2 + param0->unk_11], ov105_022461A0(param0->unk_30C), 0, 0, 15, 2, 0, 0, param0->unk_31C);
ov105_0224628C(&param0->unk_50[5], Options_Frame(param0->unk_138));
ov105_0224628C(&param0->unk_50[5], Options_Frame(param0->options));
ov105_02244EE8(param0, 0, (param0->unk_11 + 1));
param0->unk_10 = ov105_02244D14(param0, 0);
@ -803,7 +803,7 @@ static void ov105_022424CC(UnkStruct_ov105_02241FF4 *param0)
int v0;
ov105_02245528(param0, 0);
ov105_0224628C(&param0->unk_50[5], Options_Frame(param0->unk_138));
ov105_0224628C(&param0->unk_50[5], Options_Frame(param0->options));
if (ov104_0223AED4(param0->unk_09) == 0) {
param0->unk_30C = ov105_02245FB8(&param0->unk_144, param0->unk_1A, (NELEMS(Unk_ov105_02246340) - 1), 2, param0->unk_334, Unk_ov105_02246340, Unk_ov105_022462D0);
@ -1625,7 +1625,7 @@ static BOOL ov105_02243A3C(UnkStruct_ov105_02241FF4 *param0)
v3 = ov105_022461A0(param0->unk_30C);
ov105_02244FF8(param0, &param0->unk_50[2], v3, 0, 0, 15, 2, 0, 0, param0->unk_320);
ov105_0224628C(&param0->unk_50[5], Options_Frame(param0->unk_138));
ov105_0224628C(&param0->unk_50[5], Options_Frame(param0->options));
param0->unk_10 = ov105_02244D14(param0, 13);
param0->unk_08++;
@ -1749,7 +1749,7 @@ static void ov105_02243DE4(UnkStruct_ov105_02241FF4 *param0)
ov105_02246260(param0->unk_4C, &param0->unk_50[7]);
param0->unk_10 = ov105_02244C60(param0, &param0->unk_50[7], 23, 1, 1, TEXT_SPEED_NO_TRANSFER, 1, 2, 15, FONT_SYSTEM);
param0->unk_10 = ov105_02244CC0(param0, &param0->unk_50[7], 24, 1, 1 + 16, TEXT_SPEED_NO_TRANSFER, 1, 2, 15, FONT_SYSTEM);
ov105_0224628C(&param0->unk_50[5], Options_Frame(param0->unk_138));
ov105_0224628C(&param0->unk_50[5], Options_Frame(param0->options));
param0->unk_10 = ov105_02244D14(param0, 13);
Window_ScheduleCopyToVRAM(&param0->unk_50[7]);
}
@ -1765,7 +1765,7 @@ static BOOL ov105_02243E84(UnkStruct_ov105_02241FF4 *param0)
Window_ScheduleCopyToVRAM(&param0->unk_50[2]);
PokemonSprite_Delete(param0->unk_12C[0]);
ov105_0224628C(&param0->unk_50[5], Options_Frame(param0->unk_138));
ov105_0224628C(&param0->unk_50[5], Options_Frame(param0->options));
param0->unk_10 = ov105_02244D14(param0, 10);
ov105_02246074(param0->unk_30C, 0);
@ -2088,7 +2088,7 @@ static BOOL ov105_02244424(UnkStruct_ov105_02241FF4 *param0)
v2 = Pokemon_GetBoxPokemon(v1);
ov105_02244F00(param0, 2, v2);
ov105_0224628C(&param0->unk_50[5], Options_Frame(param0->unk_138));
ov105_0224628C(&param0->unk_50[5], Options_Frame(param0->options));
param0->unk_10 = ov105_02244C60(param0, &param0->unk_50[5], 16, 1, 1, Options_TextFrameDelay(SaveData_GetOptions(param0->saveData)), 1, 2, 15, FONT_MESSAGE);
@ -2882,7 +2882,7 @@ static void ov105_02245464(UnkStruct_ov105_02241FF4 *param0)
memset(param0->unk_140, 0, sizeof(PokemonSummary));
param0->unk_140->monData = param0->unk_31C;
param0->unk_140->options = param0->unk_138;
param0->unk_140->options = param0->options;
param0->unk_140->dataType = SUMMARY_DATA_PARTY_MON;
param0->unk_140->mode = SUMMARY_MODE_LOCK_MOVES;
param0->unk_140->monMax = param0->unk_12;

14
src/overlay106/ov106_02241AE0.c
View File

@ -94,7 +94,7 @@ struct UnkStruct_ov106_02243118_t {
StringList unk_9C[2];
PaletteData *unk_AC;
UnkStruct_0200C440 *unk_B0;
Options *unk_B4;
Options *options;
SaveData *saveData;
PokemonSummary *unk_BC;
UnkStruct_ov106_02243310 unk_C0;
@ -202,7 +202,7 @@ int ov106_02241AE0(ApplicationManager *appMan, int *param1)
v1->saveData = v2->saveData;
v1->unk_09 = v2->unk_04;
v1->unk_28C = &v2->unk_06;
v1->unk_B4 = SaveData_GetOptions(v1->saveData);
v1->options = SaveData_GetOptions(v1->saveData);
v1->unk_290 = v2->unk_0C;
v1->unk_294 = v2->unk_08;
v1->unk_298 = v2->unk_14;
@ -452,7 +452,7 @@ static BOOL ov106_02241E5C(UnkStruct_ov106_02243118 *param0)
param0->unk_08 = 3;
break;
} else {
ov106_02243758(&param0->unk_4C[0], Options_Frame(param0->unk_B4));
ov106_02243758(&param0->unk_4C[0], Options_Frame(param0->options));
param0->unk_0A = ov106_02242978(param0, 0, FONT_MESSAGE);
param0->unk_1A = param0->unk_0D;
param0->unk_17 = 1;
@ -492,7 +492,7 @@ static BOOL ov106_02241E5C(UnkStruct_ov106_02243118 *param0)
}
break;
case 4:
ov106_02243758(&param0->unk_4C[0], Options_Frame(param0->unk_B4));
ov106_02243758(&param0->unk_4C[0], Options_Frame(param0->options));
param0->unk_0A = ov106_02242918(param0, &param0->unk_4C[0], 32, 1, 1, Options_TextFrameDelay(SaveData_GetOptions(param0->saveData)), 1, 2, 15, FONT_MESSAGE);
Window_CopyToVRAM(&param0->unk_4C[0]);
param0->unk_08 = 5;
@ -567,7 +567,7 @@ static BOOL ov106_02242108(UnkStruct_ov106_02243118 *param0)
break;
case 3:
ov106_02243664(param0->unk_284, 0);
ov106_02243758(&param0->unk_4C[0], Options_Frame(param0->unk_B4));
ov106_02243758(&param0->unk_4C[0], Options_Frame(param0->options));
ov104_0222E5D0(param0->unk_24, 0);
param0->unk_0A = ov106_02242978(param0, 11, FONT_MESSAGE);
@ -1209,7 +1209,7 @@ static void ov106_02242CA4(UnkStruct_ov106_02243118 *param0)
param0->unk_BC->monData = param0->unk_290;
param0->unk_BC->dataType = SUMMARY_DATA_PARTY_MON;
param0->unk_BC->options = param0->unk_B4;
param0->unk_BC->options = param0->options;
param0->unk_BC->mode = SUMMARY_MODE_LOCK_MOVES;
param0->unk_BC->monMax = Party_GetCurrentCount(param0->unk_290);
param0->unk_BC->monIndex = 0;
@ -1618,7 +1618,7 @@ static void ov106_02243224(UnkStruct_ov106_02243118 *param0)
int v1;
ov106_02243664(param0->unk_284, 0);
ov106_02243758(&param0->unk_4C[0], Options_Frame(param0->unk_B4));
ov106_02243758(&param0->unk_4C[0], Options_Frame(param0->options));
StringTemplate_SetPokemonTypeName(param0->unk_24, 0, ov104_0223B5A4(param0->unk_0D));
v0 = sub_020301E0(ov106_02243090(param0->unk_0D), param0->unk_294);

42
src/overlay107/ov107_02241AE0.c
View File

@ -251,7 +251,7 @@ struct UnkStruct_ov107_02241D6C_t {
ListMenuTemplate unk_1A0;
PaletteData *unk_1C0;
UnkStruct_0200C440 * unk_1C4;
Options * unk_1C8;
Options *options;
SaveData *saveData;
UnkStruct_020302DC * unk_1D0;
UnkStruct_0203041C * unk_1D4;
@ -469,7 +469,7 @@ int ov107_02241AE0 (ApplicationManager *appMan, int * param1)
v1->unk_1D4 = sub_0203041C(v1->saveData);
v1->unk_09 = v2->unk_04;
v1->unk_438 = &v2->unk_20;
v1->unk_1C8 = SaveData_GetOptions(v1->saveData);
v1->options = SaveData_GetOptions(v1->saveData);
v1->unk_43C = v2->unk_18;
v1->unk_12 = 0xff;
v1->unk_49A = v2->unk_28;
@ -514,7 +514,7 @@ int ov107_02241BD4 (ApplicationManager *appMan, int * param1)
v0->unk_0E_2 = 0;
}
ov107_02249DBC(&v0->unk_50[6], Options_Frame(v0->unk_1C8));
ov107_02249DBC(&v0->unk_50[6], Options_Frame(v0->options));
ov104_0222E5D0(v0->unk_24, 0);
v0->unk_0A = ov107_02243918(v0, 8, FONT_MESSAGE);
@ -793,7 +793,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0)
case 3:
param0->unk_13 = v6;
ov107_02244094(param0);
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->unk_1C8));
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->options));
v2 = ov107_02249CAC(param0->saveData, param0->unk_09, 0);
@ -839,14 +839,14 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0)
v2 = ov107_02249CAC(param0->saveData, param0->unk_09, 0);
if (v2 < Unk_ov107_02249FF0[param0->unk_16][0]) {
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->unk_1C8));
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->options));
param0->unk_0A = ov107_02243918(param0, 33, FONT_MESSAGE);
param0->unk_08 = 7;
break;
}
if (v3 < Unk_ov107_02249E0C[param0->unk_16]) {
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->unk_1C8));
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->options));
param0->unk_0A = ov107_02243918(param0, 32, FONT_MESSAGE);
param0->unk_08 = 7;
break;
@ -907,7 +907,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0)
if (v3 < Unk_ov107_02249E46[0][v2]) {
ov107_02245618(param0);
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->unk_1C8));
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->options));
param0->unk_0A = ov107_02243918(param0, 41, FONT_MESSAGE);
param0->unk_08 = 7;
break;
@ -984,7 +984,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0)
v2 = ov107_02249CAC(param0->saveData, param0->unk_09, 1);
if (v2 == 1) {
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->unk_1C8));
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->options));
param0->unk_0A = ov107_02243918(param0, 54, FONT_MESSAGE);
param0->unk_08 = 14;
return 0;
@ -1026,7 +1026,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0)
default:
Window_ClearAndScheduleCopyToVRAM(&param0->unk_50[12]);
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->unk_1C8));
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->options));
ov107_02244A74(param0, 0, ov107_02244D5C(param0, param0->unk_16, param0->unk_13), 3, 0);
param0->unk_0A = ov107_02243918(param0, 55, FONT_MESSAGE);
@ -1050,7 +1050,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0)
v3 = sub_02030698(param0->frontier, sub_0205E630(param0->unk_09), sub_0205E6A8(sub_0205E630(param0->unk_09)));
if (v3 < ov107_02244D5C(param0, param0->unk_16, param0->unk_13)) {
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->unk_1C8));
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->options));
param0->unk_0A = ov107_02243918(param0, 32, FONT_MESSAGE);
ov107_02249BAC(param0->unk_3F0, 0);
@ -1061,7 +1061,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0)
if (Pokemon_GetValue(v7, MON_DATA_HELD_ITEM, NULL) == 0) {
if (ov104_0223BA14(param0->unk_09) == 0) {
ov107_02244120(param0);
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->unk_1C8));
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->options));
ov104_0223BC2C(param0->frontier, param0->unk_09, ov107_02244D5C(param0, param0->unk_16, param0->unk_13));
ov107_02245780(param0, &param0->unk_50[0]);
ov107_022455A0(param0, param0->unk_0D, ov107_02244DE0(param0, param0->unk_16, param0->unk_13));
@ -1102,7 +1102,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0)
if (v3 < Unk_ov107_02249E46[1][v2]) {
ov107_02245618(param0);
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->unk_1C8));
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->options));
param0->unk_0A = ov107_02243918(param0, 41, FONT_MESSAGE);
param0->unk_08 = 14;
break;
@ -1174,7 +1174,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0)
if (ov104_0223BA14(param0->unk_09) == 0) {
ov107_02244120(param0);
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->unk_1C8));
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->options));
ov104_0223BC2C(param0->frontier, param0->unk_09, ov107_02244D5C(param0, param0->unk_16, param0->unk_13));
ov107_02245780(param0, &param0->unk_50[0]);
ov107_022455A0(param0, param0->unk_0D, ov107_02244DE0(param0, param0->unk_16, param0->unk_13));
@ -2285,7 +2285,7 @@ static void ov107_02243FA4 (UnkStruct_ov107_02241D6C * param0)
{
param0->unk_0A = ov107_022437CC(param0, &param0->unk_50[1], 6, 16, 1 + 4, TEXT_SPEED_NO_TRANSFER, 1, 2, 0, FONT_SYSTEM, 1);
ov107_02249DBC(&param0->unk_50[7], Options_Frame(param0->unk_1C8));
ov107_02249DBC(&param0->unk_50[7], Options_Frame(param0->options));
param0->unk_0A = ov107_0224379C(param0, &param0->unk_50[7], 5, 1, 1, TEXT_SPEED_NO_TRANSFER, 1, 2, 15, FONT_MESSAGE);
}
@ -2297,7 +2297,7 @@ static void ov107_0224400C (UnkStruct_ov107_02241D6C * param0)
static void ov107_02244018 (UnkStruct_ov107_02241D6C * param0)
{
ov107_02249DBC(&param0->unk_50[8], Options_Frame(param0->unk_1C8));
ov107_02249DBC(&param0->unk_50[8], Options_Frame(param0->options));
param0->unk_16 = 0;
ov107_02244944(param0);
@ -2316,7 +2316,7 @@ static void ov107_0224403C (UnkStruct_ov107_02241D6C * param0)
static void ov107_02244064 (UnkStruct_ov107_02241D6C * param0)
{
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->unk_1C8));
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->options));
param0->unk_0A = ov107_02243918(param0, 24, FONT_MESSAGE);
param0->unk_16 = 0;
@ -2333,7 +2333,7 @@ static void ov107_02244094 (UnkStruct_ov107_02241D6C * param0)
static void ov107_0224409C (UnkStruct_ov107_02241D6C * param0)
{
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->unk_1C8));
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->options));
param0->unk_16 = 0;
ov107_02244780(param0);
@ -3584,7 +3584,7 @@ static void ov107_022454F8 (UnkStruct_ov107_02241D6C * param0, u8 param1, u8 par
v0 = ov107_02249CAC(param0->saveData, param0->unk_09, 0);
ov107_02244A8C(param0, 0, Pokemon_GetBoxPokemon(v1));
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->unk_1C8));
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->options));
param0->unk_0A = ov107_02243918(param0, Unk_ov107_02249E00[param2 - 1], FONT_MESSAGE);
@ -4028,12 +4028,12 @@ static void ov107_022459D0 (UnkStruct_ov107_02241D6C * param0, u8 param1, u8 par
case 1:
case 2:
case 3:
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->unk_1C8));
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->options));
ov107_022454F8(param0, v0, param2);
break;
case 6:
case 7:
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->unk_1C8));
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->options));
ov107_022455A0(param0, v0, param0->unk_10);
break;
case 9:
@ -4186,7 +4186,7 @@ static void ov107_02245C94 (UnkStruct_ov107_02241D6C * param0, u8 param1, u8 par
ov107_02245618(param0);
ov107_02245780(param0, &param0->unk_50[0]);
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->unk_1C8));
ov107_02249DBC(&param0->unk_50[6], Options_Frame(param0->options));
param0->unk_0A = ov107_02243918(param0, Unk_ov107_02249E34[v2][v4], FONT_MESSAGE);

26
src/overlay107/ov107_02245EB0.c
View File

@ -105,7 +105,7 @@ struct UnkStruct_ov107_02246170_t {
StringList *unk_13C;
PaletteData *unk_140;
UnkStruct_0200C440 * unk_144;
Options * unk_148;
Options *options;
SaveData *saveData;
UnkStruct_020302DC * unk_150;
UnkStruct_0203041C * unk_154;
@ -258,7 +258,7 @@ int ov107_02245EB0 (ApplicationManager *appMan, int * param1)
v1->unk_154 = sub_0203041C(v1->saveData);
v1->unk_09 = v2->unk_04;
v1->unk_3C8 = &v2->unk_20;
v1->unk_148 = SaveData_GetOptions(v1->saveData);
v1->options = SaveData_GetOptions(v1->saveData);
v1->unk_3DC = v2->unk_1C;
v1->unk_3CC = &v2->unk_08[0];
v1->unk_3D0 = &v2->unk_0C[0];
@ -309,7 +309,7 @@ int ov107_02245FD0 (ApplicationManager *appMan, int * param1)
v0->unk_0F_0 = 0;
}
ov107_02249DBC(&v0->unk_50[7], Options_Frame(v0->unk_148));
ov107_02249DBC(&v0->unk_50[7], Options_Frame(v0->options));
ov104_0222E5D0(v0->unk_24, 0);
v0->unk_0A = ov107_022477CC(v0, 7, FONT_MESSAGE);
ov107_02248350(v0, param1, 3);
@ -826,7 +826,7 @@ static BOOL ov107_022462CC (UnkStruct_ov107_02246170 * param0)
if (v1 < 50) {
ov107_02248BB4(param0);
ov107_02249DBC(&param0->unk_50[7], Options_Frame(param0->unk_148));
ov107_02249DBC(&param0->unk_50[7], Options_Frame(param0->options));
param0->unk_0A = ov107_022477CC(param0, 69, FONT_MESSAGE);
param0->unk_08 = 14;
break;
@ -2193,7 +2193,7 @@ static void ov107_022481FC (UnkStruct_ov107_02246170 * param0, Window * param1,
static void ov107_02248240 (UnkStruct_ov107_02246170 * param0)
{
param0->unk_0A = ov107_02247680(param0, &param0->unk_50[1], 5, 16, 1 + 4, TEXT_SPEED_NO_TRANSFER, 1, 2, 0, FONT_SYSTEM, 1);
ov107_02249DBC(&param0->unk_50[8], Options_Frame(param0->unk_148));
ov107_02249DBC(&param0->unk_50[8], Options_Frame(param0->options));
param0->unk_0A = ov107_02247650(param0, &param0->unk_50[8], 4, 1, 1, TEXT_SPEED_NO_TRANSFER, 1, 2, 15, FONT_MESSAGE);
}
@ -2205,7 +2205,7 @@ static void ov107_022482A4 (UnkStruct_ov107_02246170 * param0)
static void ov107_022482B0 (UnkStruct_ov107_02246170 * param0)
{
ov107_02249DBC(&param0->unk_50[9], Options_Frame(param0->unk_148));
ov107_02249DBC(&param0->unk_50[9], Options_Frame(param0->options));
param0->unk_18 = 0;
ov107_02247E5C(param0);
@ -2225,7 +2225,7 @@ static void ov107_022482D4 (UnkStruct_ov107_02246170 * param0)
static void ov107_022482FC (UnkStruct_ov107_02246170 * param0)
{
ov107_02249DBC(&param0->unk_50[7], Options_Frame(param0->unk_148));
ov107_02249DBC(&param0->unk_50[7], Options_Frame(param0->options));
param0->unk_0A = ov107_02247650(param0, &param0->unk_50[7], 37, 1, 1, TEXT_SPEED_NO_TRANSFER, 1, 2, 15, FONT_MESSAGE);
param0->unk_18 = 0;
@ -2818,7 +2818,7 @@ static void ov107_02248A8C (UnkStruct_ov107_02246170 * param0, u8 param1)
{
Pokemon * v0;
ov107_02249DBC(&param0->unk_50[7], Options_Frame(param0->unk_148));
ov107_02249DBC(&param0->unk_50[7], Options_Frame(param0->options));
v0 = Party_GetPokemonBySlotIndex(param0->unk_3DC, ov107_02249C98(param0->unk_14, param1));
ov107_02248104(param0, 0, Pokemon_GetBoxPokemon(v0));
@ -2858,7 +2858,7 @@ static void ov107_02248B50 (UnkStruct_ov107_02246170 * param0, u8 param1)
{
Pokemon * v0;
ov107_02249DBC(&param0->unk_50[7], Options_Frame(param0->unk_148));
ov107_02249DBC(&param0->unk_50[7], Options_Frame(param0->options));
v0 = Party_GetPokemonBySlotIndex(param0->unk_3DC, ov107_02249C98(param0->unk_14, param1));
ov107_02248104(param0, 0, Pokemon_GetBoxPokemon(v0));
@ -2886,7 +2886,7 @@ static void ov107_02248BB4 (UnkStruct_ov107_02246170 * param0)
static void ov107_02248BEC (UnkStruct_ov107_02246170 * param0)
{
ov107_02249DBC(&param0->unk_50[7], Options_Frame(param0->unk_148));
ov107_02249DBC(&param0->unk_50[7], Options_Frame(param0->options));
return;
}
@ -3281,7 +3281,7 @@ static void ov107_02249024 (UnkStruct_ov107_02246170 * param0, u8 param1)
v0 = Party_GetPokemonBySlotIndex(param0->unk_3DC, ov107_02249C98(param0->unk_14, param1));
ov107_02249DBC(&param0->unk_50[7], Options_Frame(param0->unk_148));
ov107_02249DBC(&param0->unk_50[7], Options_Frame(param0->options));
ov107_02248104(param0, 0, Pokemon_GetBoxPokemon(v0));
param0->unk_0A = ov107_022477CC(param0, 20, FONT_MESSAGE);
@ -3304,7 +3304,7 @@ static void ov107_022490E8 (UnkStruct_ov107_02246170 * param0, u8 param1, u8 par
u32 v0;
Pokemon * v1;
ov107_02249DBC(&param0->unk_50[7], Options_Frame(param0->unk_148));
ov107_02249DBC(&param0->unk_50[7], Options_Frame(param0->options));
v1 = Party_GetPokemonBySlotIndex(param0->unk_3DC, ov107_02249C98(param0->unk_14, param1));
ov107_02248104(param0, 0, Pokemon_GetBoxPokemon(v1));
@ -3499,7 +3499,7 @@ static void ov107_022493CC (UnkStruct_ov107_02246170 * param0, u8 param1, u8 par
ov107_02248BB4(param0);
ov107_02248C08(param0, &param0->unk_50[0]);
ov107_02249DBC(&param0->unk_50[7], Options_Frame(param0->unk_148));
ov107_02249DBC(&param0->unk_50[7], Options_Frame(param0->options));
param0->unk_0A = ov107_022477CC(param0, Unk_ov107_0224A0DC[v2][v4], FONT_MESSAGE);
return;

4
src/overlay108/ov108_02241AE0.c
View File

@ -194,7 +194,7 @@ struct UnkStruct_ov108_02241DB0_t {
Menu *unk_C0;
StringList unk_C4[2];
PaletteData *unk_D4;
Options *unk_D8;
Options *options;
SaveData *saveData;
UnkStruct_020304A0 *unk_E0;
UnkStruct_020305B8 *unk_E4;
@ -298,7 +298,7 @@ int ov108_02241AE0(ApplicationManager *appMan, int *param1)
v1->unk_426 = v2->unk_18;
v1->unk_12 = v2->unk_07;
v1->unk_3C4 = &v2->unk_38;
v1->unk_D8 = SaveData_GetOptions(v1->saveData);
v1->options = SaveData_GetOptions(v1->saveData);
v1->unk_3C8 = v2->unk_30;
v1->unk_3CC = v2->unk_34;
v1->unk_0E = 0xff;

2
src/overlay109/ov109_021D3D50.c
View File

@ -573,7 +573,7 @@ static void ov109_021D4300(UnkStruct_ov109_021D5140 *param0, NARC *param1)
Graphics_LoadTilemapToBgLayer(12, 11, v0, 6, 0, 0, 1, HEAP_ID_95);
Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 2, v0, 1, 0, 32 * 8 * 0x20, 1, HEAP_ID_95);
Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 3, v0, 1, 0, 32 * 24 * 2, 1, HEAP_ID_95);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_0C->unk_14.unk_10), HEAP_ID_95);
LoadMessageBoxGraphics(v0, 0, 1, 10, Options_Frame(param0->unk_0C->unk_14.options), HEAP_ID_95);
LoadStandardWindowGraphics(v0, 0, 1 + (18 + 12), 11, 0, HEAP_ID_95);
}

4
src/overlay110/ov110_021D0D80.c
View File

@ -52,7 +52,7 @@ typedef struct {
Strbuf* unk_118;
Strbuf* unk_11C;
PaletteData *unk_120;
const Options * unk_124;
const Options *options;
SaveData *saveData;
BattleFrontier *frontier;
} UnkStruct_ov110_021D0F78;
@ -119,7 +119,7 @@ int ov110_021D0D80 (ApplicationManager *appMan, int * param1)
v1->unk_05 = v2->unk_04;
v1->unk_06 = v2->unk_05;
v1->unk_08 = v2->unk_06;
v1->unk_124 = SaveData_GetOptions(v1->saveData);
v1->options = SaveData_GetOptions(v1->saveData);
ov110_021D1180(v1);

6
src/overlay111/ov111_021D0D80.c
View File

@ -82,7 +82,7 @@ struct UnkStruct_ov111_021D0F7C_t {
Window unk_5C[16];
PaletteData *unk_15C;
UnkStruct_0200C440 *unk_160;
Options *unk_164;
Options *options;
SaveData *saveData;
UnkStruct_ov111_021D2F80 unk_16C;
UnkStruct_ov111_021D33F4 *unk_35C[4];
@ -335,7 +335,7 @@ int ov111_021D0D80(ApplicationManager *appMan, int *param1)
v1->saveData = v2->saveData;
v1->unk_09 = v2->unk_04;
v1->unk_3D8 = &v2->unk_14;
v1->unk_164 = SaveData_GetOptions(v1->saveData);
v1->options = SaveData_GetOptions(v1->saveData);
v1->unk_3DC = &v2->unk_08[0];
v1->unk_3E0 = &v2->unk_0E[0];
@ -469,7 +469,7 @@ static BOOL ov111_021D0FC8(UnkStruct_ov111_021D0F7C *param0)
ov111_021D3468(param0->unk_390[v0], (20 + v0));
}
ov111_021D35C0(&param0->unk_5C[15], Options_Frame(param0->unk_164));
ov111_021D35C0(&param0->unk_5C[15], Options_Frame(param0->options));
ov111_021D24D4(param0);
GXLayers_EngineBToggleLayers((GX_PLANEMASK_BG0), 1);
param0->unk_12 = (4 - 1);

16
src/unk_0203D1B8.c
View File

@ -863,7 +863,7 @@ static UnkStruct_0203DA00 *sub_0203DA00(int heapID, SaveData *saveData, int para
v0->unk_04 = v4;
v0->unk_08 = v5;
v0->unk_0C = SaveData_GetOptions(saveData);
v0->options = SaveData_GetOptions(saveData);
v0->records = SaveData_GetGameRecords(saveData);
v0->unk_14 = SaveData_GetTrainerInfo(saveData);
v0->unk_18 = param3;
@ -964,7 +964,7 @@ static void sub_0203DB38(UnkStruct_ov88_0223C370 *param0, FieldSystem *fieldSyst
param0->unk_08 = SaveData_GetParty(fieldSystem->saveData);
param0->unk_0C = SaveData_SaveTable(fieldSystem->saveData, SAVE_TABLE_ENTRY_PAL_PAD);
param0->wiFiHistory = SaveData_WiFiHistory(fieldSystem->saveData);
param0->unk_18 = SaveData_GetOptions(fieldSystem->saveData);
param0->options = SaveData_GetOptions(fieldSystem->saveData);
param0->unk_24 = SaveData_GetPokedex(fieldSystem->saveData);
param0->unk_30 = SaveData_GetDexMode(fieldSystem->saveData);
param0->saveData = fieldSystem->saveData;
@ -1029,7 +1029,7 @@ BOOL sub_0203DBF0(FieldTask *param0)
v2->unk_48.unk_08 = v2->unk_04.unk_38;
v2->unk_48.unk_00 = Pokemon_GetBoxPokemon(v2->unk_04.unk_3C);
v2->unk_48.unk_04 = Pokemon_GetBoxPokemon(v2->unk_04.unk_40);
v2->unk_48.unk_14 = SaveData_GetOptions(fieldSystem->saveData);
v2->unk_48.options = SaveData_GetOptions(fieldSystem->saveData);
v2->unk_48.unk_10 = 1;
switch (FieldSystem_GetTimeOfDay(fieldSystem)) {
@ -1121,7 +1121,7 @@ void sub_0203DDFC(FieldSystem *fieldSystem)
v0->unk_00 = fieldSystem->unk_80;
v0->unk_04 = fieldSystem->journalEntry;
v0->unk_08 = SaveData_GetOptions(fieldSystem->saveData);
v0->options = SaveData_GetOptions(fieldSystem->saveData);
FieldSystem_StartChildProcess(fieldSystem, &Unk_020EA258, v0);
}
@ -1132,7 +1132,7 @@ void *sub_0203DE34(FieldSystem *fieldSystem)
v0->saveData = fieldSystem->saveData;
v0->unk_04 = fieldSystem->unk_80;
v0->unk_08 = SaveData_GetOptions(fieldSystem->saveData);
v0->options = SaveData_GetOptions(fieldSystem->saveData);
v0->records = SaveData_GetGameRecords(fieldSystem->saveData);
v0->unk_10 = fieldSystem->journalEntry;
@ -1356,7 +1356,7 @@ void sub_0203E0FC(FieldSystem *fieldSystem, int param1)
v0->unk_14 = SaveData_GetWiFiList(fieldSystem->saveData);
v0->wiFiHistory = SaveData_WiFiHistory(fieldSystem->saveData);
v0->unk_1C = SaveData_GetTrainerInfo(fieldSystem->saveData);
v0->unk_24 = SaveData_GetOptions(fieldSystem->saveData);
v0->options = SaveData_GetOptions(fieldSystem->saveData);
v0->records = SaveData_GetGameRecords(fieldSystem->saveData);
v0->unk_2C = fieldSystem->journalEntry;
v0->unk_3C = PokemonSummaryScreen_ShowContestData(fieldSystem->saveData);
@ -1387,7 +1387,7 @@ void *sub_0203E1AC(FieldSystem *fieldSystem, int param1, int param2)
v0->unk_00 = sub_0202D750(fieldSystem->saveData);
v0->unk_04 = sub_0202D764(fieldSystem->saveData);
v0->unk_08 = SaveData_GetSystemData(fieldSystem->saveData);
v0->unk_10 = SaveData_GetOptions(fieldSystem->saveData);
v0->options = SaveData_GetOptions(fieldSystem->saveData);
v0->unk_14 = sub_0202AD28(SaveData_GetWiFiList(fieldSystem->saveData));
v0->saveData = fieldSystem->saveData;
v0->unk_1C = sub_02039058(SaveData_GetWiFiList(fieldSystem->saveData));
@ -1511,7 +1511,7 @@ void sub_0203E2FC(FieldSystem *fieldSystem)
sub_0206D578(fieldSystem, v2);
v0.unk_00 = v2;
v0.unk_04 = SaveData_GetOptions(fieldSystem->saveData);
v0.options = SaveData_GetOptions(fieldSystem->saveData);
v0.unk_08 = SaveData_GetTrainerInfo(fieldSystem->saveData);
v0.unk_0C = Sound_GetOverrideBGM(fieldSystem, fieldSystem->location->mapId);

2
src/unk_02046C7C.c
View File

@ -113,7 +113,7 @@ BOOL ScrCmd_0FA(ScriptContext *param0)
v8.unk_0C = v0;
v8.unk_10 = v3;
v8.unk_14 = sub_0202A750(param0->fieldSystem->saveData);
v8.unk_18 = SaveData_GetOptions(param0->fieldSystem->saveData);
v8.options = SaveData_GetOptions(param0->fieldSystem->saveData);
v8.saveData = param0->fieldSystem->saveData;
v8.unk_20 = SaveData_GetChatotCry(param0->fieldSystem->saveData);

2
src/unk_0204EDA4.c
View File

@ -76,7 +76,7 @@ static void sub_0204EE90(ScriptContext *param0, u16 param1, Pokemon *param2, u16
v1->unk_00 = param2;
v1->unk_04 = SaveData_GetTrainerInfo(FieldSystem_GetSaveData(param0->fieldSystem));
v1->unk_08 = SaveData_GetOptions(param0->fieldSystem->saveData);
v1->options = SaveData_GetOptions(param0->fieldSystem->saveData);
v1->unk_0C = param3;
v1->unk_15 = param1;

6
src/unk_02052C6C.c
View File

@ -266,14 +266,14 @@ static void sub_02052F28(FieldSystem *fieldSystem, UnkStruct_0205300C *param1)
static void sub_02052FA8(FieldSystem *fieldSystem, UnkStruct_0205300C *param1)
{
Options *v0 = SaveData_GetOptions(fieldSystem->saveData);
Options *options = SaveData_GetOptions(fieldSystem->saveData);
param1->unk_2C = MessageBank_GetNewStrbufFromNARC(26, 213, 15, 32);
FieldMessage_AddWindow(fieldSystem->bgConfig, &param1->unk_1C, 3);
FieldMessage_DrawWindow(&param1->unk_1C, v0);
FieldMessage_DrawWindow(&param1->unk_1C, options);
param1->unk_34 = FieldMessage_Print(&param1->unk_1C, param1->unk_2C, v0, 1);
param1->unk_34 = FieldMessage_Print(&param1->unk_1C, param1->unk_2C, options, 1);
param1->unk_30 = Window_AddWaitDial(&param1->unk_1C, 1024 - (18 + 12));
}

8
src/unk_020683F4.c
View File

@ -936,12 +936,10 @@ static BOOL sub_02068F48(FieldTask *task)
MapObjectMan_PauseAllMovement(fieldSystem->mapObjMan);
FieldMessage_AddWindow(fieldSystem->bgConfig, &v1->unk_00, 3);
{
const Options *v2 = SaveData_GetOptions(fieldSystem->saveData);
const Options *options = SaveData_GetOptions(fieldSystem->saveData);
FieldMessage_DrawWindow(&v1->unk_00, v2);
v1->unk_14 = FieldMessage_Print(&v1->unk_00, v1->unk_10, v2, 1);
}
FieldMessage_DrawWindow(&v1->unk_00, options);
v1->unk_14 = FieldMessage_Print(&v1->unk_00, v1->unk_10, options, 1);
v1->unk_16++;
break;
case 1:

11
src/unk_0207AE68.c
View File

@ -59,7 +59,6 @@
#include "constdata/const_020F410C.h"
UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, Pokedex *param5, Bag *param6, GameRecords *records, Poketch *poketch, int param9, int param10, int heapID);
static void sub_0207B0A0(SysTask *param0, void *param1);
BOOL sub_0207B0D0(UnkStruct_0207AE68 *param0);
void sub_0207B0E0(UnkStruct_0207AE68 *param0);
@ -89,7 +88,7 @@ static const u8 Unk_020F0A2C[] = {
0x8
};
UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, Pokedex *param5, Bag *param6, GameRecords *records, Poketch *poketch, int param9, int param10, int heapID)
UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *options, int param4, Pokedex *param5, Bag *param6, GameRecords *records, Poketch *poketch, int param9, int param10, int heapID)
{
UnkStruct_0207AE68 *v0;
PokemonSpriteTemplate v1;
@ -122,7 +121,7 @@ UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Opt
v0->unk_00 = BgConfig_New(heapID);
v0->unk_04 = Window_New(heapID, 1);
v0->unk_2C = param3;
v0->options = options;
v0->unk_34 = sub_0207C690(heapID);
sub_0207C63C();
@ -498,7 +497,7 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0)
PokemonSprite_SetAttribute(param0->unk_1C[0], MON_SPRITE_HIDE, 1);
PokemonSprite_SetAttribute(param0->unk_1C[1], MON_SPRITE_HIDE, 1);
param0->unk_3C->monData = param0->unk_28;
param0->unk_3C->options = param0->unk_2C;
param0->unk_3C->options = param0->options;
param0->unk_3C->dataType = SUMMARY_DATA_MON;
param0->unk_3C->monIndex = 0;
param0->unk_3C->monMax = 1;
@ -883,7 +882,7 @@ static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BgConfig *param1)
int v8 = 8;
int v9 = 3;
v4 = Options_Frame(param0->unk_2C);
v4 = Options_Frame(param0->options);
ReplaceTransparentTiles(param1, 1, 1, 10, v4, param0->heapID);
Graphics_LoadTilesToBgLayer(v5, v6, param1, v9, 0, 0, 1, param0->heapID);
@ -976,7 +975,7 @@ static u8 sub_0207C584(UnkStruct_0207AE68 *param0, int param1)
Heap_FreeToHeap(v0);
Window_FillTilemap(param0->unk_04, 0xff);
return Text_AddPrinterWithParams(param0->unk_04, FONT_MESSAGE, param0->unk_10, 0, 0, Options_TextFrameDelay(param0->unk_2C), sub_0207C5CC);
return Text_AddPrinterWithParams(param0->unk_04, FONT_MESSAGE, param0->unk_10, 0, 0, Options_TextFrameDelay(param0->options), sub_0207C5CC);
}
static BOOL sub_0207C5CC(TextPrinterTemplate *param0, u16 param1)

10
src/unk_0208694C.c
View File

@ -64,7 +64,7 @@ struct UnkStruct_02087A10_t {
int unk_0C;
int unk_10;
int unk_14;
Options *unk_18;
Options *options;
UnkStruct_02087A10_sub1 unk_1C;
u16 unk_38;
u16 unk_3A[6][13];
@ -1189,7 +1189,7 @@ static int sub_02086F3C(ApplicationManager *appMan, int *param1)
return 1;
}
UnkStruct_0208737C *sub_0208712C(int heapID, int param1, int param2, int param3, Options *param4)
UnkStruct_0208737C *sub_0208712C(int heapID, int param1, int param2, int param3, Options *options)
{
UnkStruct_0208737C *v0 = (UnkStruct_0208737C *)Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0208737C));
@ -1202,7 +1202,7 @@ UnkStruct_0208737C *sub_0208712C(int heapID, int param1, int param2, int param3,
v0->unk_44 = 0;
v0->unk_48 = NULL;
v0->unk_10 = 0;
v0->unk_4C = param4;
v0->options = options;
v0->unk_08 = 0;
return v0;
@ -1232,7 +1232,7 @@ static void sub_020871B0(UnkStruct_02087A10 *param0, UnkStruct_0208737C *param1)
param0->unk_08 = param1->unk_08;
param0->unk_0C = param1->unk_0C;
param0->unk_10 = param1->unk_10;
param0->unk_18 = param1->unk_4C;
param0->options = param1->options;
}
static void sub_020871CC(void)
@ -1508,7 +1508,7 @@ static void sub_0208769C(UnkStruct_02087A10 *param0, NARC *param1)
Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 6, v0, 1, 0, (32 * 14 * 2), 1, HEAP_ID_18);
Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 7, v0, 0, 0, (32 * 14 * 2), 1, HEAP_ID_18);
Font_LoadScreenIndicatorsPalette(0, 12 * 32, HEAP_ID_18);
LoadMessageBoxGraphics(param0->unk_160, 4, (32 * 8), 10, Options_Frame(param0->unk_18), HEAP_ID_18);
LoadMessageBoxGraphics(param0->unk_160, 4, (32 * 8), 10, Options_Frame(param0->options), HEAP_ID_18);
Font_LoadScreenIndicatorsPalette(4, 12 * 32, HEAP_ID_18);
param0->unk_510 = Graphics_GetCharDataFromOpenNARC(param1, 16, 1, &param0->unk_514, HEAP_ID_18);

20
src/unk_020890F4.c
View File

@ -151,40 +151,40 @@ static int sub_0208927C(ApplicationManager *appMan, int *param1)
return 1;
}
UnkStruct_02089438 *sub_020893B4(int heapID, int param1, int param2[], Options *param3, u32 param4, u32 param5)
static UnkStruct_02089438 *sub_020893B4(int heapID, int param1, int param2[], Options *options, u32 param4, u32 param5)
{
int v0;
int i;
UnkStruct_02089438 *v1 = NULL;
v1 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02089438));
v1->unk_00 = param1;
v1->unk_1C = Strbuf_Init(param1 + 1, heapID);
v1->unk_20 = param3;
v1->options = options;
for (v0 = 0; v0 < 4; v0++) {
v1->unk_04[v0] = param2[v0];
for (i = 0; i < 4; i++) {
v1->unk_04[i] = param2[i];
}
v1->unk_04[v0] = param2[v0 - 1];
v1->unk_04[i] = param2[i - 1];
v1->unk_2C = param4;
v1->unk_30 = param5;
return v1;
}
UnkStruct_02089438 *sub_02089400(int heapID, int param1, int param2[], Options *param3, u32 param4, u32 param5)
UnkStruct_02089438 *sub_02089400(int heapID, int param1, int param2[], Options *options, u32 param4, u32 param5)
{
UnkStruct_02089438 *v0 = sub_020893B4(heapID, param1, param2, param3, param4, param5);
UnkStruct_02089438 *v0 = sub_020893B4(heapID, param1, param2, options, param4, param5);
v0->unk_24 = 0;
v0->unk_28 = 0;
return v0;
}
UnkStruct_02089438 *sub_0208941C(int heapID, int param1, int param2[], Options *param3, u32 param4, u32 param5, u32 param6, u32 param7)
UnkStruct_02089438 *sub_0208941C(int heapID, int param1, int param2[], Options *options, u32 param4, u32 param5, u32 param6, u32 param7)
{
UnkStruct_02089438 *v0 = sub_020893B4(heapID, param1, param2, param3, param4, param5);
UnkStruct_02089438 *v0 = sub_020893B4(heapID, param1, param2, options, param4, param5);
v0->unk_24 = param6;
v0->unk_28 = param7;

2
src/unk_0208A3F4.c
View File

@ -103,7 +103,7 @@ void sub_0208A490(UnkStruct_02089688 *param0)
SpriteSystem_LoadAnimResObjFromOpenNarc(v2, v3, v0, 11, FALSE, 1002);
{
int v5 = Options_Frame(param0->unk_38C.unk_20);
int v5 = Options_Frame(param0->unk_38C.options);
LoadMessageBoxGraphics(v1, 4, 1, 10, v5, HEAP_ID_101);
PaletteData_LoadBufferFromFileStart(v4, 38, GetMessageBoxPaletteNARCMember(v5), 101, 1, 0x20, 11 * 16);

4
src/unk_020933F8.c
View File

@ -418,7 +418,7 @@ UnkStruct_02095C48 *sub_02093800(const UnkStruct_02093800 *param0)
v0->unk_00.unk_10D = v0->unk_00.unk_115;
v0->unk_00.unk_10E = 1;
v0->unk_1980 = param0->unk_14;
v0->unk_196C = param0->unk_18;
v0->options = param0->options;
v0->saveData = param0->saveData;
v0->unk_1974 = param0->unk_08;
v0->unk_197C = param0->unk_05;
@ -599,7 +599,7 @@ void sub_02093BBC(UnkStruct_02095C48 *param0)
v0->unk_14 = param0->unk_00.unk_10F;
v0->unk_18 = sub_02029D04(param0->unk_1980);
v0->unk_1C = &param0->unk_1984;
v0->unk_20 = param0->unk_196C;
v0->options = param0->options;
v0->unk_24 = param0->unk_1978;
param0->unk_199C = v0;

14
src/unk_02097B18.c
View File

@ -156,13 +156,9 @@ static int sub_02097B18(ApplicationManager *appMan, int *param1)
v0->unk_D4.unk_D0 = PokemonSpriteManager_New(HEAP_ID_53);
v0->unk_D4.unk_188 = sub_02015F84(HEAP_ID_53, 1, 0);
{
int v7;
v7 = Options_Frame(v0->unk_00->unk_24);
ov76_0223C8EC(v0->unk_D4.unk_10, v0->unk_D4.unk_14, v7);
ov76_0223C974(v0->unk_D4.unk_10, v0->unk_D4.unk_14, v7);
}
int v7 = Options_Frame(v0->unk_00->options);
ov76_0223C8EC(v0->unk_D4.unk_10, v0->unk_D4.unk_14, v7);
ov76_0223C974(v0->unk_D4.unk_10, v0->unk_D4.unk_14, v7);
ov76_0223C398(&v0->unk_D4);
@ -365,7 +361,7 @@ static BOOL sub_02097F38(FieldTask *param0)
partyMan->selectedMonSlot = 0;
partyMan->unk_21 = 0;
partyMan->unk_20 = 15;
partyMan->options = v1->unk_24;
partyMan->options = v1->options;
FieldTask_RunApplication(param0, &Unk_020F1E88, partyMan);
v0->unk_14 = 4;
@ -420,7 +416,7 @@ void sub_020980DC(FieldTask *param0, SaveData *saveData)
v0->saveData = saveData;
v0->unk_08 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_02097F18));
memset(v0->unk_08, 0, sizeof(UnkStruct_02097F18));
v0->unk_08->unk_24 = SaveData_GetOptions(saveData);
v0->unk_08->options = SaveData_GetOptions(saveData);
v0->unk_08->saveData = saveData;
v0->unk_0C = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
memset(v0->unk_0C, 0, sizeof(PartyManagementData));

4
src/unk_02098218.c
View File

@ -72,8 +72,8 @@ static int sub_02098218(ApplicationManager *appMan, int *param1)
v0 = ApplicationManager_Args(appMan);
v1->unk_00 = v0;
v1->unk_04.unk_0C = Options_TextFrameDelay(v1->unk_00->unk_0C.unk_04);
v1->unk_04.unk_10 = Options_Frame(v1->unk_00->unk_0C.unk_04);
v1->unk_04.unk_0C = Options_TextFrameDelay(v1->unk_00->unk_0C.options);
v1->unk_04.unk_10 = Options_Frame(v1->unk_00->unk_0C.options);
v1->unk_04.unk_34 = ov119_021D0DD4();
v1->unk_04.unk_38 = PokemonSpriteManager_New(HEAP_ID_71);
v1->unk_04.unk_3C = NARC_ctor(NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA, HEAP_ID_71);

9
src/unk_020985E4.c
View File

@ -22,13 +22,10 @@ FS_EXTERN_OVERLAY(overlay100);
void sub_020985E4(FieldTask *param0, SaveData *saveData)
{
UnkStruct_0209862C *v0;
UnkStruct_020985E4 *v1;
UnkStruct_0209862C *v0 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0209862C));
UnkStruct_020985E4 *v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_020985E4));
v0 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0209862C));
v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_020985E4));
v1->unk_04 = SaveData_GetOptions(saveData);
v1->options = SaveData_GetOptions(saveData);
v1->unk_08 = SaveData_GetTrainerInfo(saveData);
v1->unk_00 = TrainerInfo_Gender(v1->unk_08);

12
src/unk_020989DC.c
View File

@ -106,7 +106,7 @@ UnkStruct_0203D9B8 *sub_020989DC(SaveData *saveData, int heapID)
v0->unk_0C = SaveData_GetTrainerInfo(saveData);
v0->unk_10 = SaveData_GetParty(saveData);
v0->unk_14 = SaveData_GetBag(saveData);
v0->unk_18 = SaveData_GetOptions(saveData);
v0->options = SaveData_GetOptions(saveData);
v1 = Poffin_New(heapID);
v3 = StringTemplate_New(1, 32, heapID);
@ -289,7 +289,7 @@ static int sub_02098C44(UnkStruct_02098BE4 *param0)
partyMan->bag = param0->unk_0C->unk_14;
partyMan->unk_21 = 0;
partyMan->unk_20 = 20;
partyMan->options = param0->unk_0C->unk_18;
partyMan->options = param0->unk_0C->options;
param0->appMan = ApplicationManager_New(&Unk_020F1E88, partyMan, param0->heapID);
param0->unk_10 = (void *)partyMan;
@ -322,7 +322,7 @@ static int sub_02098CB0(UnkStruct_02098BE4 *param0)
v2 = Heap_AllocFromHeap(param0->heapID, sizeof(PokemonSummary));
v2->monData = param0->unk_0C->unk_10;
v2->options = param0->unk_0C->unk_18;
v2->options = param0->unk_0C->options;
v2->dataType = SUMMARY_DATA_PARTY_MON;
v2->monIndex = v0;
v2->monMax = Party_GetCurrentCount(v2->monData);
@ -381,8 +381,8 @@ static int sub_02098D7C(UnkStruct_02098BE4 *param0)
v1->unk_08 = param0->unk_0C->unk_1C[param0->unk_0C->unk_01].unk_02;
v1->unk_04 = PoffinCase_AllocateForSlot(param0->unk_0C->poffinCase, param0->unk_0C->unk_1C[param0->unk_0C->unk_01].unk_00, param0->heapID);
v1->unk_00 = Party_GetPokemonBySlotIndex(param0->unk_0C->unk_10, param0->unk_08);
v1->unk_0A = Options_TextFrameDelay(param0->unk_0C->unk_18);
v1->unk_0B = Options_Frame(param0->unk_0C->unk_18);
v1->unk_0A = Options_TextFrameDelay(param0->unk_0C->options);
v1->unk_0B = Options_Frame(param0->unk_0C->options);
param0->appMan = ApplicationManager_New(&v0, v1, param0->heapID);
param0->unk_10 = v1;
@ -419,7 +419,7 @@ static int sub_02098E0C(UnkStruct_02098BE4 *param0)
v2 = PoffinCase_AllocateForSlot(param0->unk_0C->poffinCase, param0->unk_0C->unk_1C[param0->unk_0C->unk_01].unk_00, param0->heapID);
v1->monData = param0->unk_0C->unk_10;
v1->options = param0->unk_0C->unk_18;
v1->options = param0->unk_0C->options;
v1->dataType = SUMMARY_DATA_PARTY_MON;
v1->monIndex = param0->unk_08;
v1->monMax = Party_GetCurrentCount(v1->monData);

4
src/unk_0209C194.c
View File

@ -69,10 +69,10 @@ void *sub_0209C1EC(FieldSystem *fieldSystem)
v0->fieldSystem = fieldSystem;
v0->unk_08.saveData = fieldSystem->saveData;
v0->unk_08.unk_0C = fieldSystem->unk_80;
v0->unk_08.unk_10 = SaveData_GetOptions(fieldSystem->saveData);
v0->unk_08.options = SaveData_GetOptions(fieldSystem->saveData);
v0->unk_08.records = SaveData_GetGameRecords(fieldSystem->saveData);
v0->unk_08.unk_18 = SaveData_GetJournal(fieldSystem->saveData);
v0->unk_08.unk_04 = Options_Frame(v0->unk_08.unk_10);
v0->unk_08.unk_04 = Options_Frame(v0->unk_08.options);
v0->unk_08.fieldSystem = fieldSystem;
return v0;