Leahnaya/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2026-05-31 20:43:00 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into game_stats

Browse Source
This commit is contained in:
Adrienn Tindall 2024-08-26 23:33:33 -04:00 committed by GitHub
commit 4eec69a630
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/field_system.h
View File

@ -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;

4
src/field_system.c
View File

@ -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) {

2
src/overlay_124.c
View File

@ -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);

2
src/start_menu.c
View File

@ -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);
}
}

2
src/unk_02092BE8.c
View File

@ -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) {