Skip to content

Commit 5a491a5

Browse files
PikalaxALTPikalaxALT
committed
Renaming, 2
1 parent a5a02e2 commit 5a491a5

6 files changed

Lines changed: 42 additions & 33 deletions

File tree

include/application/pokegear/phone.h renamed to include/application/pokegear/pokegear_internal.h

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef GUARD_POKEHEARTGOLD_APPLICATION_POKEGEAR_PHONE_H
2-
#define GUARD_POKEHEARTGOLD_APPLICATION_POKEGEAR_PHONE_H
1+
#ifndef GUARD_POKEHEARTGOLD_APPLICATION_POKEGEAR_POKEGEAR_INTERNAL_H
2+
#define GUARD_POKEHEARTGOLD_APPLICATION_POKEGEAR_POKEGEAR_INTERNAL_H
33

44
#include "global.h"
55

@@ -127,25 +127,22 @@ struct PokegearAppData {
127127
}; // size: 0xCC
128128

129129
int ov100_021E5C50(u16 a0, u16 a1);
130-
BOOL ov100_021E5D3C(PokegearAppData *phoneApp, int a1);
131-
u8 ov100_021E5DC8(PokegearAppData *phoneApp);
132-
int ov100_021E5C80(PokegearAppData *phoneApp);
133-
BOOL ov100_021E5900(PokegearAppData *phoneApp);
134-
int ov100_021E5924(PokegearAppData *phoneApp);
135-
BOOL ov100_021E5BB0(PokegearAppData *phoneApp, BOOL a1);
136-
BOOL ov100_021E5DDC(PokegearAppData *phoneApp);
137-
BOOL ov100_021E5E88(PokegearAppData *phoneApp);
138-
void ov100_021E5EB4(PokegearAppData *phoneApp, int a1);
130+
BOOL ov100_021E5D3C(PokegearAppData *pokegearApp, int a1);
131+
u8 ov100_021E5DC8(PokegearAppData *pokegearApp);
132+
int ov100_021E5C80(PokegearAppData *pokegearApp);
133+
BOOL ov100_021E5900(PokegearAppData *pokegearApp);
134+
int ov100_021E5924(PokegearAppData *pokegearApp);
135+
BOOL ov100_021E5BB0(PokegearAppData *pokegearApp, BOOL a1);
136+
BOOL ov100_021E5DDC(PokegearAppData *pokegearApp);
137+
BOOL ov100_021E5E88(PokegearAppData *pokegearApp);
138+
void ov100_021E5EB4(PokegearAppData *pokegearApp, int a1);
139139
void ov100_021E5FDC(void);
140140

141-
BOOL Pokegear_Init(OVY_MANAGER *man, int *state);
142-
BOOL Pokegear_Main(OVY_MANAGER *man, int *state);
143-
BOOL Pokegear_Exit(OVY_MANAGER *man, int *state);
144-
void ov100_021E65F4(void *cb_args);
141+
void PokegearApp_VBlankCB(void *cb_args);
145142

146-
void ov100_021E6914(PokegearAppData *phoneApp);
147-
void ov100_021E6950(PokegearAppData *phoneApp);
148-
void ov100_021E69E8(PokegearAppData *phoneApp);
143+
void ov100_021E6914(PokegearAppData *pokegearApp);
144+
void ov100_021E6950(PokegearAppData *pokegearApp);
145+
void ov100_021E69E8(PokegearAppData *pokegearApp);
149146

150147
PokegearApp_UnkSub094 *ov100_021E69F8(HeapID heapId, u16 a1, u16 a2, u16 a3, u16 a4, int a5);
151148
void ov100_021E6A3C(PokegearApp_UnkSub094 *a0);
@@ -172,4 +169,4 @@ u8 ov100_021E73AC(PokegearApp_UnkSub07C *a0, u8 a1);
172169
u8 ov100_021E73C8(PokegearApp_UnkSub07C *a0, u8 a1);
173170
void ov100_021E7414(PokegearApp_UnkSub07C *a0, u16 a1, BOOL a2);
174171

175-
#endif // GUARD_POKEHEARTGOLD_APPLICATION_POKEGEAR_PHONE_H
172+
#endif // GUARD_POKEHEARTGOLD_APPLICATION_POKEGEAR_POKEGEAR_INTERNAL_H

‎include/application/pokegear/pokegear_main.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#ifndef GUARD_POKEHEARTGOLD_APPLICATION_POKEGEAR_POKEGEAR_MAIN_H
2+
#define GUARD_POKEHEARTGOLD_APPLICATION_POKEGEAR_POKEGEAR_MAIN_H
3+
4+
#include "global.h"
5+
6+
#include "overlay_manager.h"
7+
8+
BOOL Pokegear_Init(OVY_MANAGER *man, int *state);
9+
BOOL Pokegear_Main(OVY_MANAGER *man, int *state);
10+
BOOL Pokegear_Exit(OVY_MANAGER *man, int *state);
11+
12+
#endif // GUARD_POKEHEARTGOLD_APPLICATION_POKEGEAR_POKEGEAR_MAIN_H

src/application/pokegear/phone/overlay_100_021E5900.c renamed to src/application/pokegear/main/overlay_100_021E5900.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "global.h"
22

3-
#include "application/pokegear/phone.h"
3+
#include "application/pokegear/pokegear_internal.h"
44

55
#include "map_header.h"
66
#include "system.h"
@@ -233,7 +233,7 @@ BOOL ov100_021E5DDC(PokegearAppData *pokegearApp) {
233233
ov100_021E6374(pokegearApp);
234234
break;
235235
case 3:
236-
Main_SetVBlankIntrCB(ov100_021E65F4, pokegearApp);
236+
Main_SetVBlankIntrCB(PokegearApp_VBlankCB, pokegearApp);
237237
pokegearApp->unk_018 = 0;
238238
return TRUE;
239239
}

src/application/pokegear/phone/overlay_100_021E6914.c renamed to src/application/pokegear/main/overlay_100_021E6914.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "application/pokegear/phone.h"
1+
#include "application/pokegear/pokegear_internal.h"
22

33
#include "math_util.h"
44
#include "unk_0200ACF0.h"

src/application/pokegear/phone/phone_app_main.c renamed to src/application/pokegear/main/pokegear_main.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#include "application/pokegear/phone.h"
1+
#include "application/pokegear/pokegear_internal.h"
2+
#include "application/pokegear/pokegear_main.h"
23

34
#include "mail_misc.h"
45
#include "overlay_101.h"
@@ -27,8 +28,7 @@ typedef enum PokegearAppMainState {
2728
POKEGEAR_APP_MAIN_STATE_QUIT,
2829
} PokegearAppMainState;
2930

30-
static BOOL ov100_021E6408(OVY_MANAGER **ppOvyMan);
31-
void ov100_021E65F4(void *cb_args);
31+
static BOOL PokegearApp_RunSubapp(OVY_MANAGER **ppOvyMan);
3232
static PokegearAppMainState Pokegear_MainStep_Setup(PokegearAppData *pokegearApp);
3333
static PokegearAppMainState Pokegear_MainStep_Teardown(PokegearAppData *pokegearApp);
3434
static PokegearAppMainState Pokegear_MainStep_LaunchMap(PokegearAppData *pokegearApp);
@@ -42,7 +42,7 @@ static PokegearAppMainState Pokegear_MainStep_RunPhone(PokegearAppData *pokegear
4242
static PokegearAppMainState Pokegear_MainStep_LaunchRadio(PokegearAppData *pokegearApp);
4343
static PokegearAppMainState Pokegear_MainStep_RunRadio(PokegearAppData *pokegearApp);
4444

45-
static BOOL ov100_021E6408(OVY_MANAGER **ppOvyMan) {
45+
static BOOL PokegearApp_RunSubapp(OVY_MANAGER **ppOvyMan) {
4646
if (*ppOvyMan != NULL && OverlayManager_Run(*ppOvyMan)) {
4747
OverlayManager_Delete(*ppOvyMan);
4848
*ppOvyMan = NULL;
@@ -154,7 +154,7 @@ BOOL Pokegear_Exit(OVY_MANAGER *man, int *state) {
154154
// Local functions
155155
// -----------------------------
156156

157-
void ov100_021E65F4(void *cb_args) {
157+
void PokegearApp_VBlankCB(void *cb_args) {
158158
PokegearAppData *pokegearApp = (PokegearAppData *)cb_args;
159159

160160
if (pokegearApp->unk_058 != NULL) {
@@ -214,7 +214,7 @@ static PokegearAppMainState Pokegear_MainStep_LaunchMap(PokegearAppData *pokegea
214214
}
215215

216216
static PokegearAppMainState Pokegear_MainStep_RunMap(PokegearAppData *pokegearApp) {
217-
if (!ov100_021E6408(&pokegearApp->childApplication)) {
217+
if (!PokegearApp_RunSubapp(&pokegearApp->childApplication)) {
218218
return POKEGEAR_APP_MAIN_STATE_RUN_MAP;
219219
}
220220

@@ -259,7 +259,7 @@ static PokegearAppMainState Pokegear_MainStep_LaunchDebug(PokegearAppData *pokeg
259259
}
260260

261261
static PokegearAppMainState Pokegear_MainStep_RunDebug(PokegearAppData *pokegearApp) {
262-
if (!ov100_021E6408(&pokegearApp->childApplication)) {
262+
if (!PokegearApp_RunSubapp(&pokegearApp->childApplication)) {
263263
return POKEGEAR_APP_MAIN_STATE_RUN_DEBUG;
264264
}
265265

@@ -280,7 +280,7 @@ static PokegearAppMainState Pokegear_MainStep_LaunchConfigure(PokegearAppData *p
280280
}
281281

282282
static PokegearAppMainState Pokegear_MainStep_RunConfigure(PokegearAppData *pokegearApp) {
283-
if (!ov100_021E6408(&pokegearApp->childApplication)) {
283+
if (!PokegearApp_RunSubapp(&pokegearApp->childApplication)) {
284284
return POKEGEAR_APP_MAIN_STATE_RUN_CONFIGUREPOKEGEAR_APP_MAIN_STATE_LAUNCH_CONFIGURE;
285285
}
286286

@@ -311,7 +311,7 @@ static PokegearAppMainState Pokegear_MainStep_LaunchPhone(PokegearAppData *pokeg
311311
}
312312

313313
static PokegearAppMainState Pokegear_MainStep_RunPhone(PokegearAppData *pokegearApp) {
314-
if (!ov100_021E6408(&pokegearApp->childApplication)) {
314+
if (!PokegearApp_RunSubapp(&pokegearApp->childApplication)) {
315315
return POKEGEAR_APP_MAIN_STATE_RUN_PHONE;
316316
}
317317

@@ -342,7 +342,7 @@ static PokegearAppMainState Pokegear_MainStep_LaunchRadio(PokegearAppData *pokeg
342342
}
343343

344344
static PokegearAppMainState Pokegear_MainStep_RunRadio(PokegearAppData *pokegearApp) {
345-
if (!ov100_021E6408(&pokegearApp->childApplication)) {
345+
if (!PokegearApp_RunSubapp(&pokegearApp->childApplication)) {
346346
return POKEGEAR_APP_MAIN_STATE_RUN_RADIO;
347347
}
348348

‎src/launch_application.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "constants/flags.h"
66

7-
#include "application/pokegear/phone.h"
7+
#include "application/pokegear/pokegear_main.h"
88
#include "application/view_rankings.h"
99
#include "battle/battle_022378C0.h"
1010

0 commit comments

Comments
 (0)