diff --git a/include/field_system.h b/include/field_system.h index 4f3f66b6b..4cb9b064a 100644 --- a/include/field_system.h +++ b/include/field_system.h @@ -167,7 +167,7 @@ struct FieldSystem { BOOL menuInputState; // Tracks whether the last menu input was touch or keypad u8 unk_110; u8 unk_111[3]; - GearPhoneRingManager *unk114; + GearPhoneRingManager *phoneRingManager; BugContest *bugContest; u8 unk11C[0x8]; u32 judgeStatPosition; diff --git a/src/field_system.c b/src/field_system.c index 3aa1e9c49..43e86807e 100644 --- a/src/field_system.c +++ b/src/field_system.c @@ -159,7 +159,7 @@ void FieldSystem_Delete(OVY_MANAGER *man) { Field_FreeMapEvents(fieldSystem); FreeToHeap(fieldSystem->bagCursor); sub_02092BD0(fieldSystem->unkA8); - sub_02092DD8(fieldSystem->unk114); + sub_02092DD8(fieldSystem->phoneRingManager); FreeToHeap(fieldSystem->unk0); OverlayManager_FreeData(man); DestroyHeap(HEAP_ID_89); @@ -265,7 +265,7 @@ void sub_0203E15C(FieldSystem *fieldSystem) { ov01_021F2F24(fieldSystem->playerAvatar); ov01_021F6830(fieldSystem, 0, 1); if (flag != 2) { - sub_02092FA8(fieldSystem->unk114); + sub_02092FA8(fieldSystem->phoneRingManager); } } else { if (gSystem.newKeys & PAD_BUTTON_A) { diff --git a/src/overlay_124.c b/src/overlay_124.c index 5d82ff114..0476cd604 100644 --- a/src/overlay_124.c +++ b/src/overlay_124.c @@ -37,7 +37,7 @@ void FieldSystem_Init(OVY_MANAGER *man, FieldSystem *fieldSystem) { } fieldSystem->unkA8 = sub_02092BB8(HEAP_ID_FIELD); fieldSystem->unk108 = FieldSystem_UnkSub108_Alloc(HEAP_ID_FIELD); - fieldSystem->unk114 = GearPhoneRingManager_New(HEAP_ID_FIELD, fieldSystem); + fieldSystem->phoneRingManager = GearPhoneRingManager_New(HEAP_ID_FIELD, fieldSystem); fieldSystem->judgeStatPosition = 0; if ((key + key2) % 4073) { ov124_02260D1C(fieldSystem); diff --git a/src/start_menu.c b/src/start_menu.c index b3b54b0d1..f01f7a749 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -611,7 +611,7 @@ BOOL FieldSystem_ShouldDrawStartMenuIcon(FieldSystem *fieldSystem, StartMenuIcon static void FieldSystem_ResetGearRingManagerIfNotSelectingSaveOrPokegear(FieldSystem *fieldSystem) { if (fieldSystem->lastStartMenuAction != START_MENU_ACTION_SAVE && fieldSystem->lastStartMenuAction != START_MENU_ACTION_POKEGEAR) { - sub_02092FA8(fieldSystem->unk114); + sub_02092FA8(fieldSystem->phoneRingManager); } } diff --git a/src/unk_02092BE8.c b/src/unk_02092BE8.c index 5c0c5a12c..5ac6a1499 100644 --- a/src/unk_02092BE8.c +++ b/src/unk_02092BE8.c @@ -110,7 +110,7 @@ void sub_02092DD8(GearPhoneRingManager * ptr) { } GearPhoneRingManager* FieldSystem_GetGearPhoneRingManager(FieldSystem* sys) { - return sys->unk114; + return sys->phoneRingManager; } void sub_02092DF4(GearPhoneRingManager* ptr) {