diff --git a/asm/code_800D090.s b/asm/code_800D090.s index 7f7964ea4..f2ccfa20f 100644 --- a/asm/code_800D090.s +++ b/asm/code_800D090.s @@ -7437,7 +7437,7 @@ sub_8010960: _080109EC: .4byte gUnknown_203B0E8 _080109F0: .4byte 0x000052d8 _080109F4: .4byte 0x000052da -_080109F8: .4byte gGameOptions +_080109F8: .4byte gGameOptionsRef _080109FC: .4byte gPlayTimeRef thumb_func_end sub_8010960 diff --git a/asm/code_803D110.s b/asm/code_803D110.s index 4380ca510..755bbd6c5 100644 --- a/asm/code_803D110.s +++ b/asm/code_803D110.s @@ -2156,7 +2156,7 @@ _0803E156: pop {r0} bx r0 .align 2, 0 -_0803E170: .4byte gGameOptions +_0803E170: .4byte gGameOptionsRef _0803E174: .4byte gUnknown_202D038 thumb_func_end sub_803E13C @@ -2713,7 +2713,7 @@ _0803E630: .4byte 0x000181f0 _0803E634: .4byte 0x000181f2 _0803E638: .4byte 0x000181fc _0803E63C: .4byte gUnknown_202EDD0 -_0803E640: .4byte gGameOptions +_0803E640: .4byte gGameOptionsRef _0803E644: .4byte 0x00018215 _0803E648: .4byte 0x0001c06c _0803E64C: .4byte gUnknown_203B40D @@ -2778,7 +2778,7 @@ sub_803E668: bx r0 .align 2, 0 _0803E6F0: .4byte gUnknown_202EDD4 -_0803E6F4: .4byte gGameOptions +_0803E6F4: .4byte gGameOptionsRef _0803E6F8: .4byte gUnknown_202EDCC _0803E6FC: .4byte gPlayTimeRef _0803E700: .4byte gDungeonGlobalData @@ -4467,7 +4467,7 @@ _0803F410: .4byte gDungeonGlobalData _0803F414: .4byte 0x000181e8 _0803F418: .4byte 0x0000ffff _0803F41C: .4byte 0x00018228 -_0803F420: .4byte gGameOptions +_0803F420: .4byte gGameOptionsRef _0803F424: .4byte gUnknown_202D06C thumb_func_end sub_803F38C @@ -5610,7 +5610,7 @@ _0803FCB0: movs r0, 0 b _0803FD00 .align 2, 0 -_0803FCE4: .4byte gGameOptions +_0803FCE4: .4byte gGameOptionsRef _0803FCE8: .4byte gUnknown_202D068 _0803FCEC: .4byte gUnknown_202B038 _0803FCF0: .4byte gDungeonGlobalData diff --git a/asm/code_8040094.s b/asm/code_8040094.s index c2b78a430..bc8f4835d 100644 --- a/asm/code_8040094.s +++ b/asm/code_8040094.s @@ -635,7 +635,7 @@ _08040606: adds r0, 0x80 b _0804062C .align 2, 0 -_08040618: .4byte gGameOptions +_08040618: .4byte gGameOptionsRef _0804061C: bl DoesNotHaveShadedMap lsls r0, 24 @@ -1146,7 +1146,7 @@ _08040A24: .4byte 0x00000215 _08040A28: .4byte 0x00000fff _08040A2C: .4byte 0x0000fffe _08040A30: .4byte 0x0000fffd -_08040A34: .4byte gGameOptions +_08040A34: .4byte gGameOptionsRef _08040A38: .4byte 0x000001ff _08040A3C: movs r1, 0 @@ -1237,7 +1237,7 @@ sub_8040ABC: movs r0, 0 b _08040AEC .align 2, 0 -_08040AD8: .4byte gGameOptions +_08040AD8: .4byte gGameOptionsRef _08040ADC: cmp r1, 0 beq _08040AE8 diff --git a/asm/code_80495E4.s b/asm/code_80495E4.s index c4b6318a7..a70f7ce14 100644 --- a/asm/code_80495E4.s +++ b/asm/code_80495E4.s @@ -2146,7 +2146,7 @@ _0804A8AC: adds r0, r3, r1 b _0804A8DC .align 2, 0 -_0804A8C0: .4byte gGameOptions +_0804A8C0: .4byte gGameOptionsRef _0804A8C4: .4byte 0x00012b80 _0804A8C8: ldr r4, _0804A8D4 @@ -2299,7 +2299,7 @@ _0804A9D6: adds r0, r3, r1 b _0804AA08 .align 2, 0 -_0804A9EC: .4byte gGameOptions +_0804A9EC: .4byte gGameOptionsRef _0804A9F0: .4byte 0x00012b80 _0804A9F4: ldr r4, _0804AA00 diff --git a/asm/code_805D8C8.s b/asm/code_805D8C8.s index 111e5bde0..4d7ec0e80 100644 --- a/asm/code_805D8C8.s +++ b/asm/code_805D8C8.s @@ -633,7 +633,7 @@ _0805DDC2: .align 2, 0 _0805DDC8: .4byte gRealInputs _0805DDCC: .4byte 0x00000707 -_0805DDD0: .4byte gGameOptions +_0805DDD0: .4byte gGameOptionsRef _0805DDD4: .4byte gUnknown_202F22D _0805DDD8: .4byte gUnknown_202F22C _0805DDDC: .4byte gUnknown_202F22E @@ -782,7 +782,7 @@ _0805DEDC: b _0805DF3A .align 2, 0 _0805DEF8: .4byte gUnknown_202F22C -_0805DEFC: .4byte gGameOptions +_0805DEFC: .4byte gGameOptionsRef _0805DF00: .4byte gRealInputs _0805DF04: .4byte gUnknown_202F22D _0805DF08: .4byte 0x01000200 @@ -859,7 +859,7 @@ _0805DFA0: .4byte gUnknown_202EE00 _0805DFA4: .4byte gRealInputs _0805DFA8: .4byte gDungeonGlobalData _0805DFAC: .4byte 0x00018214 -_0805DFB0: .4byte gGameOptions +_0805DFB0: .4byte gGameOptionsRef _0805DFB4: .4byte 0x0000066d _0805DFB8: .4byte gUnknown_202F22C _0805DFBC: @@ -14595,7 +14595,7 @@ _08064DFE: b _08064E40 .align 2, 0 _08064E2C: .4byte gUnknown_202EE10 -_08064E30: .4byte gGameOptions +_08064E30: .4byte gGameOptionsRef _08064E34: .4byte gUnknown_202F2E8 _08064E38: cmp r0, 0x1 @@ -14896,7 +14896,7 @@ _08065088: bx r0 .align 2, 0 _08065090: .4byte gUnknown_80FEBF8 -_08065094: .4byte gGameOptions +_08065094: .4byte gGameOptionsRef _08065098: .4byte gUnknown_202F2E8 thumb_func_end sub_8065040 @@ -16681,7 +16681,7 @@ _08065F16: movs r6, 0 b _08065F64 .align 2, 0 -_08065F28: .4byte gGameOptions +_08065F28: .4byte gGameOptionsRef _08065F2C: .4byte gUnknown_202EE10 _08065F30: .4byte gUnknown_2027370 _08065F34: .4byte gUnknown_80FF774 diff --git a/asm/code_806CD90.s b/asm/code_806CD90.s index c632eb580..f3e889e45 100644 --- a/asm/code_806CD90.s +++ b/asm/code_806CD90.s @@ -1076,7 +1076,7 @@ _0806D858: lsrs r4, r1, 31 b _0806D8B6 .align 2, 0 -_0806D8B0: .4byte gGameOptions +_0806D8B0: .4byte gGameOptionsRef _0806D8B4: movs r4, 0 _0806D8B6: diff --git a/asm/code_8073CF0.s b/asm/code_8073CF0.s index b44a9a743..97cfc9c5e 100644 --- a/asm/code_8073CF0.s +++ b/asm/code_8073CF0.s @@ -2308,7 +2308,7 @@ _08074FD0: movs r0, 0x2 b _08074FEC .align 2, 0 -_08074FE0: .4byte gGameOptions +_08074FE0: .4byte gGameOptionsRef _08074FE4: .4byte gUnknown_202F378 _08074FE8: ldr r1, _08075048 @@ -2383,7 +2383,7 @@ sub_8075050: movs r0, 0x2 b _0807507C .align 2, 0 -_08075070: .4byte gGameOptions +_08075070: .4byte gGameOptionsRef _08075074: .4byte gUnknown_202F378 _08075078: ldr r1, _080750D0 @@ -2611,7 +2611,7 @@ UseAttack: b _08075248 .align 2, 0 _08075238: .4byte gUnknown_202F32D -_0807523C: .4byte gGameOptions +_0807523C: .4byte gGameOptionsRef _08075240: .4byte gUnknown_202F378 _08075244: ldr r1, _080752D0 diff --git a/asm/code_8098BDC.s b/asm/code_8098BDC.s index c7c416730..03083edbd 100644 --- a/asm/code_8098BDC.s +++ b/asm/code_8098BDC.s @@ -658,7 +658,7 @@ _08099604: bne _080995AE b _08099454 .align 2, 0 -_08099620: .4byte gGameOptions +_08099620: .4byte gGameOptionsRef _08099624: movs r0, 0x10 bl FadeOutAllMusic @@ -738,7 +738,7 @@ sub_8099690: .align 2, 0 _080996BC: .4byte gUnknown_8116028 _080996C0: .4byte gSystemFileArchive -_080996C4: .4byte gGameOptions +_080996C4: .4byte gGameOptionsRef _080996C8: .4byte gUnknown_202D078 _080996CC: ldr r4, _080996D0 @@ -6907,7 +6907,7 @@ sub_809C6EC: bl sub_809C6CC b _0809C71E .align 2, 0 -_0809C70C: .4byte gGameOptions +_0809C70C: .4byte gGameOptionsRef _0809C710: movs r0, 0x3 bl sub_809C6CC @@ -7962,7 +7962,7 @@ _0809CECC: bl sub_809C6CC b _0809CEF6 .align 2, 0 -_0809CEEC: .4byte gGameOptions +_0809CEEC: .4byte gGameOptionsRef _0809CEF0: movs r0, 0x3 bl sub_809C6CC diff --git a/src/code_2.c b/src/code_2.c index c3117520b..2eb67e28d 100644 --- a/src/code_2.c +++ b/src/code_2.c @@ -64,7 +64,7 @@ extern u32 gUnknown_203B03C; extern u16 gUnknown_2026E4E; extern s32 gUnknown_2000A80; extern struct OpenedFile *gTitlePaletteFile; -extern struct GameOptions *gGameOptions; +extern struct GameOptions *gGameOptionsRef; extern char gPMDBuildVersion[]; @@ -200,7 +200,7 @@ void xxx_update_stuff(u32 r0) { xxx_draw_string_80144C4(); sub_8005838(0, 0); - nullsub_8(gGameOptions->unkA); + nullsub_8(gGameOptionsRef->unkA); sub_8005180(); sub_80060EC(); sub_8011860(); diff --git a/src/code_80118A4.c b/src/code_80118A4.c index a45daf914..5e4a285a9 100644 --- a/src/code_80118A4.c +++ b/src/code_80118A4.c @@ -14,7 +14,7 @@ void xxx_call_stop_bgm(void); extern bool8 sub_80023E4(u8); extern void xxx_call_stop_fanfare_se(u16 r0); -extern struct GameOptions *gGameOptions; +extern struct GameOptions *gGameOptionsRef; struct UnkBgStruct { @@ -62,7 +62,7 @@ void sub_801169C(void) return_var = sub_80111C4(); sub_8004AF0(return_var, &(gUnknown_203B0E4->unk4c4c), 0xB0, 0x10, (gUnknown_203B0E4->unk4dcc), 0); sub_8005838(0, 0); - nullsub_8(gGameOptions->unkA); + nullsub_8(gGameOptionsRef->unkA); sub_8005180(); sub_80060EC(); IncrementPlayTime(gPlayTimeRef); diff --git a/src/code_8012A18.c b/src/code_8012A18.c index 62b45785f..4da7efc1f 100644 --- a/src/code_8012A18.c +++ b/src/code_8012A18.c @@ -16,14 +16,14 @@ extern void sub_8009908(); extern void xxx_call_update_bg_sound_input(); extern void ResetSprites(u8 r0); -extern struct GameOptions *gGameOptions; +extern struct GameOptions *gGameOptionsRef; void sub_8012A18() { sub_8011860(); xxx_draw_string_80144C4(); - nullsub_8(gGameOptions->unkA); + nullsub_8(gGameOptionsRef->unkA); sub_8005180(); sub_80060EC(); sub_800CB20(); diff --git a/src/code_801DCC4.c b/src/code_801DCC4.c index 04088eb20..d5e331aab 100644 --- a/src/code_801DCC4.c +++ b/src/code_801DCC4.c @@ -49,7 +49,7 @@ extern void SetWindowBGColor(void); extern void sub_8099690(u32); extern void sub_8012CAC(struct UnkTextStruct2 *, struct MenuItem *); -extern struct GameOptions *gGameOptions; +extern struct GameOptions *gGameOptionsRef; extern struct unkStruct_203B25C *gUnknown_203B25C; extern const struct UnkTextStruct2 gUnknown_80DBFCC; extern const struct UnkTextStruct2 gUnknown_80DBFB0; @@ -364,7 +364,7 @@ void sub_801DED0(void) break; case 6: // Load our current options? - gUnknown_203B25C->newOptions = *gGameOptions; + gUnknown_203B25C->newOptions = *gGameOptionsRef; sub_801E198(&gUnknown_203B25C->newOptions); break; case 7: @@ -507,7 +507,7 @@ void HandleChangeSettingsMenu(void) { case MENU_OPTION_YES: // Save our option changes?? - *gGameOptions = gUnknown_203B25C->newOptions; + *gGameOptionsRef = gUnknown_203B25C->newOptions; SetWindowBGColor(); sub_8099690(0); sub_801DD6C(1); diff --git a/src/code_8069E0C.c b/src/code_8069E0C.c index 3f08dd395..276f2ae23 100644 --- a/src/code_8069E0C.c +++ b/src/code_8069E0C.c @@ -13,7 +13,7 @@ #include "game_options.h" #include "text_util.h" -extern struct GameOptions *gGameOptions; +extern struct GameOptions *gGameOptionsRef; struct unkStruct_80F520C { @@ -240,7 +240,7 @@ void sub_806A1E8(struct DungeonEntity *pokemon) entityData = pokemon->entityData; bVar3 = (!entityData->isEnemy); } - if (gGameOptions->FarOffPals == '\0') { + if (gGameOptionsRef->FarOffPals == '\0') { bVar3 = FALSE; } if (bVar3 && (sub_8045888(pokemon) == '\0')) { diff --git a/src/game_options.c b/src/game_options.c index 4c4d2c223..fe0619421 100644 --- a/src/game_options.c +++ b/src/game_options.c @@ -16,52 +16,52 @@ struct unkStruct_8094CB0 extern struct WindowBG gWindowBGColors; -extern struct GameOptions *gGameOptions; -extern struct GameOptions gUnknown_2038C70; +extern struct GameOptions *gGameOptionsRef; +extern struct GameOptions gGameOptions; extern void SetWindowBGColor(void); extern void sub_80099F0(u32); void LoadGameOptions(void) { - gGameOptions = &gUnknown_2038C70; + gGameOptionsRef = &gGameOptions; } struct GameOptions * GetGameOptions(void) { - return &gUnknown_2038C70; + return &gGameOptions; } void InitializeGameOptions(bool8 initializeGender) { - gGameOptions->windowColor = WINDOW_COLOR_BLUE; + gGameOptionsRef->windowColor = WINDOW_COLOR_BLUE; if(initializeGender) { - gGameOptions->playerGender = MALE; + gGameOptionsRef->playerGender = MALE; } - gGameOptions->unk9 = 0; - gGameOptions->unkA = 0; - gGameOptions->dungeonSpeed = DUNGEON_SPEED_SLOW; - gGameOptions->FarOffPals = FAROFFPALS_LOCK; - gGameOptions->damageTurn = TRUE; - gGameOptions->gridEnable = TRUE; - gGameOptions->mapOption = MAP_OPTION_CLEAR; - gGameOptions->unkC = 0; + gGameOptionsRef->unk9 = 0; + gGameOptionsRef->unkA = 0; + gGameOptionsRef->dungeonSpeed = DUNGEON_SPEED_SLOW; + gGameOptionsRef->FarOffPals = FAROFFPALS_LOCK; + gGameOptionsRef->damageTurn = TRUE; + gGameOptionsRef->gridEnable = TRUE; + gGameOptionsRef->mapOption = MAP_OPTION_CLEAR; + gGameOptionsRef->unkC = 0; SetWindowBGColor(); } bool8 GameOptionsNotChange(struct GameOptions *r0) { // NOTE: had to nest to match - if(gGameOptions->windowColor == r0->windowColor) - if(gGameOptions->unk9 == r0->unk9) - if(gGameOptions->unkA == r0->unkA) - if(gGameOptions->playerGender == r0->playerGender) - if(gGameOptions->dungeonSpeed == r0->dungeonSpeed) - if(gGameOptions->FarOffPals == r0->FarOffPals) - if(gGameOptions->damageTurn == r0->damageTurn) - if(gGameOptions->gridEnable == r0->gridEnable) - if(gGameOptions->mapOption == r0->mapOption) - if(gGameOptions->unkC == r0->unkC) + if(gGameOptionsRef->windowColor == r0->windowColor) + if(gGameOptionsRef->unk9 == r0->unk9) + if(gGameOptionsRef->unkA == r0->unkA) + if(gGameOptionsRef->playerGender == r0->playerGender) + if(gGameOptionsRef->dungeonSpeed == r0->dungeonSpeed) + if(gGameOptionsRef->FarOffPals == r0->FarOffPals) + if(gGameOptionsRef->damageTurn == r0->damageTurn) + if(gGameOptionsRef->gridEnable == r0->gridEnable) + if(gGameOptionsRef->mapOption == r0->mapOption) + if(gGameOptionsRef->unkC == r0->unkC) return TRUE; return FALSE; } @@ -76,9 +76,9 @@ void WriteGameOptions(struct unkStruct_8094924 *param_1) neg_1 = -1; zero = 0; - SaveIntegerBits(param_1, &gGameOptions->windowColor, 2); + SaveIntegerBits(param_1, &gGameOptionsRef->windowColor, 2); - if(gGameOptions->unk9 != 0) + if(gGameOptionsRef->unk9 != 0) { puVar2 = &neg_1; } @@ -88,7 +88,7 @@ void WriteGameOptions(struct unkStruct_8094924 *param_1) } SaveIntegerBits(param_1, puVar2, 1); - if(gGameOptions->unkA != 0) + if(gGameOptionsRef->unkA != 0) { puVar2 = &neg_1; } @@ -98,7 +98,7 @@ void WriteGameOptions(struct unkStruct_8094924 *param_1) } SaveIntegerBits(param_1, puVar2, 1); - if(gGameOptions->playerGender != MALE) + if(gGameOptionsRef->playerGender != MALE) { puVar2 = &neg_1; } @@ -108,7 +108,7 @@ void WriteGameOptions(struct unkStruct_8094924 *param_1) } SaveIntegerBits(param_1, puVar2, 1); - if(gGameOptions->dungeonSpeed != DUNGEON_SPEED_SLOW) + if(gGameOptionsRef->dungeonSpeed != DUNGEON_SPEED_SLOW) { puVar2 = &neg_1; } @@ -118,7 +118,7 @@ void WriteGameOptions(struct unkStruct_8094924 *param_1) } SaveIntegerBits(param_1, puVar2, 1); - if(gGameOptions->FarOffPals != FAROFFPALS_SELF) + if(gGameOptionsRef->FarOffPals != FAROFFPALS_SELF) { puVar2 = &neg_1; } @@ -128,7 +128,7 @@ void WriteGameOptions(struct unkStruct_8094924 *param_1) } SaveIntegerBits(param_1, puVar2, 1); - if(gGameOptions->damageTurn) + if(gGameOptionsRef->damageTurn) { puVar2 = &neg_1; } @@ -138,7 +138,7 @@ void WriteGameOptions(struct unkStruct_8094924 *param_1) } SaveIntegerBits(param_1, puVar2, 1); - if(gGameOptions->gridEnable) + if(gGameOptionsRef->gridEnable) { puVar2 = &neg_1; } @@ -148,42 +148,42 @@ void WriteGameOptions(struct unkStruct_8094924 *param_1) } SaveIntegerBits(param_1, puVar2, 1); - SaveIntegerBits(param_1, &gGameOptions->mapOption, NUM_GBA_MAP_OPTIONS); - SaveIntegerBits(param_1, &gGameOptions->unkC, 2); + SaveIntegerBits(param_1, &gGameOptionsRef->mapOption, NUM_GBA_MAP_OPTIONS); + SaveIntegerBits(param_1, &gGameOptionsRef->unkC, 2); } void ReadGameOptions(struct unkStruct_8094924 *param_1) { u8 byteArray[4]; RestoreIntegerBits(param_1, byteArray, 2); - gGameOptions->windowColor = byteArray[0] & NUM_WINDOW_COLORS; + gGameOptionsRef->windowColor = byteArray[0] & NUM_WINDOW_COLORS; RestoreIntegerBits(param_1, byteArray, 1); - gGameOptions->unk9 = byteArray[0] & 1; + gGameOptionsRef->unk9 = byteArray[0] & 1; RestoreIntegerBits(param_1, byteArray, 1); - gGameOptions->unkA = byteArray[0] & 1; + gGameOptionsRef->unkA = byteArray[0] & 1; RestoreIntegerBits(param_1, byteArray, 1); - gGameOptions->playerGender = byteArray[0] & 1; + gGameOptionsRef->playerGender = byteArray[0] & 1; RestoreIntegerBits(param_1, byteArray, 1); - gGameOptions->dungeonSpeed = byteArray[0] & 1; + gGameOptionsRef->dungeonSpeed = byteArray[0] & 1; RestoreIntegerBits(param_1, byteArray, 1); - gGameOptions->FarOffPals = byteArray[0] & 1; + gGameOptionsRef->FarOffPals = byteArray[0] & 1; RestoreIntegerBits(param_1, byteArray, 1); - gGameOptions->damageTurn = byteArray[0] & 1; + gGameOptionsRef->damageTurn = byteArray[0] & 1; RestoreIntegerBits(param_1, byteArray, 1); - gGameOptions->gridEnable = byteArray[0] & 1; + gGameOptionsRef->gridEnable = byteArray[0] & 1; RestoreIntegerBits(param_1, byteArray, 3); - gGameOptions->mapOption = byteArray[0] & NUM_DS_MAP_OPTIONS; + gGameOptionsRef->mapOption = byteArray[0] & NUM_DS_MAP_OPTIONS; RestoreIntegerBits(param_1, byteArray, 2); - gGameOptions->unkC = byteArray[0] & 3; + gGameOptionsRef->unkC = byteArray[0] & 3; SetWindowBGColor(); } @@ -194,12 +194,12 @@ void SetWindowBGColor(void) temp = gWindowBGColors; - sub_80099F0(temp.hexBG[gGameOptions->windowColor & NUM_WINDOW_COLORS]); + sub_80099F0(temp.hexBG[gGameOptionsRef->windowColor & NUM_WINDOW_COLORS]); } bool8 sub_8094C48(void) { - switch(gGameOptions->mapOption) + switch(gGameOptionsRef->mapOption) { default: return TRUE; @@ -211,7 +211,7 @@ bool8 sub_8094C48(void) bool8 DoesNotHaveShadedMap(void) { - switch(gGameOptions->mapOption) + switch(gGameOptionsRef->mapOption) { default: return TRUE; @@ -223,14 +223,14 @@ bool8 DoesNotHaveShadedMap(void) void sub_8094C88(void) { - if(gGameOptions->mapOption < 3) - gGameOptions->mapOption = 1; + if(gGameOptionsRef->mapOption < 3) + gGameOptionsRef->mapOption = 1; else { - if((u8)(gGameOptions->mapOption - 3) > 2) + if((u8)(gGameOptionsRef->mapOption - 3) > 2) return; else - gGameOptions->mapOption = 4; + gGameOptionsRef->mapOption = 4; } } diff --git a/src/personality_test.c b/src/personality_test.c index 7c7240d56..4aa324a7b 100644 --- a/src/personality_test.c +++ b/src/personality_test.c @@ -73,7 +73,7 @@ extern void AddMenuCursorSprite(struct UnkInputStruct **r0); extern void xxx_call_draw_string(u32 x, u32 y, const char *text, u32, u32); extern u32 sub_80095E4(s16, u32); -extern struct GameOptions *gGameOptions; +extern struct GameOptions *gGameOptionsRef; extern const char gStarterReveal[]; @@ -596,12 +596,12 @@ void SetPlayerGender(void) if (sub_80144A4(&gender) == 0) { if (gender == MALE) { gPersonalityTestTracker->playerGender = MALE; - gGameOptions->playerGender = MALE; + gGameOptionsRef->playerGender = MALE; } else { gPersonalityTestTracker->playerGender = FEMALE; - gGameOptions->playerGender = FEMALE; + gGameOptionsRef->playerGender = FEMALE; } sub_8099690(0); gPersonalityTestTracker->TestState = PERSONALITY_REVEAL; diff --git a/src/save.c b/src/save.c index 6e602636f..8ce87a56e 100644 --- a/src/save.c +++ b/src/save.c @@ -14,7 +14,7 @@ EWRAM_DATA u32 gUnknown_203B17C; EWRAM_DATA char *gUnknown_203B180; EWRAM_DATA struct UnkStruct_203B184 *gUnknown_203B184; -extern struct GameOptions *gGameOptions; +extern struct GameOptions *gGameOptionsRef; struct unk_struct { @@ -629,7 +629,7 @@ void sub_8012334(struct UnkStruct_203B184 *r0) gUnknown_203B494 = r0->unk20; gUnknown_203B498 = r0->ExclusivePokemon; gFriendAreas = r0->BoughtFriendAreas; - gGameOptions = r0->gameOptions; + gGameOptionsRef = r0->gameOptions; gPlayTimeRef = r0->playTime; return; } @@ -644,7 +644,7 @@ void sub_8012334(struct UnkStruct_203B184 *r0) gUnknown_203B494 = sub_8097680(); gUnknown_203B498 = GetExclusivePokemon(); gFriendAreas = GetBoughtFriendAreas(); - gGameOptions = GetGameOptions(); + gGameOptionsRef = GetGameOptions(); gPlayTimeRef = GetPlayTime(); } diff --git a/src/wonder_mail_2.c b/src/wonder_mail_2.c index 316a79d46..7c2d69cc0 100644 --- a/src/wonder_mail_2.c +++ b/src/wonder_mail_2.c @@ -93,7 +93,7 @@ struct unkStruct_203B2D8 }; extern struct unkStruct_203B2D8 *gUnknown_203B2D8; -extern struct GameOptions *gGameOptions; +extern struct GameOptions *gGameOptionsRef; extern s32 GetNumPKMNNews(void); @@ -824,7 +824,7 @@ void sub_802BC08(void) void sub_802BC7C(void) { PrintPokeNameToBuffer(gAvailablePokemonNames, sub_808D3BC()); - if(gGameOptions->playerGender == FEMALE) + if(gGameOptionsRef->playerGender == FEMALE) { strcpy(gAvailablePokemonNames + 0x50, gUnknown_80DFC4C); // She } diff --git a/sym_ewram.txt b/sym_ewram.txt index 656c158b3..bfa1ce4d7 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -933,7 +933,7 @@ gMovesData = .; /* 2038C68 */ gMovesRelated_2038C6C = .; /* 2038C6C */ . += 0x4; -gUnknown_2038C70 = .; /* 2038C70 */ +gGameOptions = .; /* 2038C70 */ . += 0x10; gPlayTime = .; /* 2038C80 */ diff --git a/sym_ewram2.txt b/sym_ewram2.txt index 0762db5ac..932a4d595 100644 --- a/sym_ewram2.txt +++ b/sym_ewram2.txt @@ -596,7 +596,7 @@ gRescueTeamInfoRef = .; /* 203B464 */ gFriendAreas = .; /* 203B468 */ . += 0x4; -gGameOptions = .; /* 203B46C */ +gGameOptionsRef = .; /* 203B46C */ . += 0x4; gUnknown_203B470 = .; /* 203B470 */