Skip to content

Commit e7fdb2c

Browse files
CharlesFolz4CharlesFolz4
committed
Initial PR feedback
1 parent 6248e4d commit e7fdb2c

File tree

16 files changed

+67
-67
lines changed

16 files changed

+67
-67
lines changed

‎asm/macros/scrcmd.inc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,7 +1523,7 @@
15231523
.short \syncState
15241524
.endm
15251525

1526-
.macro ContestNew contestRank, contestType, competitionType, partySlot
1526+
.macro NewContest contestRank, contestType, competitionType, partySlot
15271527
.short 250
15281528
.short \contestRank
15291529
.short \contestType
@@ -1536,7 +1536,7 @@
15361536
.short \mapID
15371537
.endm
15381538

1539-
.macro ScrCmd_BufferJudgeName judgeID, idx
1539+
.macro BufferJudgeName judgeID, idx
15401540
.short 252
15411541
.short \judgeID
15421542
.short \idx
@@ -1657,15 +1657,15 @@
16571657
.short 274
16581658
.endm
16591659

1660-
.macro HBlankSystem_Stop
1660+
.macro StopHBlank
16611661
.short 275
16621662
.endm
16631663

1664-
.macro HBlankSystem_Start
1664+
.macro StartHBlank
16651665
.short 276
16661666
.endm
16671667

1668-
.macro ScrCmd_GetShouldSkipAwardCeremony destSkipAwardCeremony
1668+
.macro GetShouldSkipAwardCeremony destSkipAwardCeremony
16691669
.short 277
16701670
.short \destSkipAwardCeremony
16711671
.endm

‎include/overlay017/ov17_0223B140.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
#include "overlay_manager.h"
77

8-
int ActingCompetitionInit(ApplicationManager *appMan, int *param1);
9-
int ActingCompetitionMain(ApplicationManager *appMan, int *param1);
10-
int ActingCompetitionExit(ApplicationManager *appMan, int *param1);
8+
int ActingCompetition_Init(ApplicationManager *appMan, int *param1);
9+
int ActingCompetition_Main(ApplicationManager *appMan, int *param1);
10+
int ActingCompetition_Exit(ApplicationManager *appMan, int *param1);
1111
void ov17_0223BB14(UnkStruct_ov17_02246F24 *param0, int param1, int param2);
1212

1313
#endif // POKEPLATINUM_OV17_0223B140_H

‎include/overlay017/ov17_0223CB1C.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include "overlay_manager.h"
55

6-
int VisualCompetitonScoringInit(ApplicationManager *appMan, int *param1);
7-
int VisualCompetitionScoringMain(ApplicationManager *appMan, int *param1);
8-
int VisualCompetitionScoringExit(ApplicationManager *appMan, int *param1);
6+
int VisualCompetitonScoring_Init(ApplicationManager *appMan, int *param1);
7+
int VisualCompetitionScoring_Main(ApplicationManager *appMan, int *param1);
8+
int VisualCompetitionScoring_Exit(ApplicationManager *appMan, int *param1);
99

1010
#endif // POKEPLATINUM_OV17_0223CB1C_H

‎include/overlay017/ov17_0223DAD0.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
#include "overlay_manager.h"
55

6-
int DanceCompetitionInit(ApplicationManager *appMan, int *param1);
7-
int DanceCompetitionMain(ApplicationManager *appMan, int *param1);
8-
int DanceCompetitionExit(ApplicationManager *appMan, int *param1);
6+
int DanceCompetition_Init(ApplicationManager *appMan, int *param1);
7+
int DanceCompetition_Main(ApplicationManager *appMan, int *param1);
8+
int DanceCompetition_Exit(ApplicationManager *appMan, int *param1);
99
int ov17_0223F0BC(int param0, int param1);
1010

1111
#endif // POKEPLATINUM_OV17_0223DAD0_H

‎include/overlay017/ov17_0224F4D4.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include "overlay_manager.h"
55

6-
int ContestFinalScoringInit(ApplicationManager *appMan, int *param1);
7-
int ContestFinalScoringMain(ApplicationManager *appMan, int *param1);
8-
int ContestFinalScoringExit(ApplicationManager *appMan, int *param1);
6+
int ContestFinalScoring_Init(ApplicationManager *appMan, int *param1);
7+
int ContestFinalScoring_Main(ApplicationManager *appMan, int *param1);
8+
int ContestFinalScoring_Exit(ApplicationManager *appMan, int *param1);
99

1010
#endif // POKEPLATINUM_OV17_0224F4D4_H

‎include/overlay022/ov22_02255D44.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
int ov22_02255D44(ApplicationManager *appMan, int *param1);
77
int ov22_02255E50(ApplicationManager *appMan, int *param1);
88
int ov22_02256098(ApplicationManager *appMan, int *param1);
9-
int VisualCompetitionInit(ApplicationManager *appMan, int *param1);
10-
int VisualCompetitionMain(ApplicationManager *appMan, int *param1);
11-
int VisualCompetitionExit(ApplicationManager *appMan, int *param1);
9+
int VisualCompetition_Init(ApplicationManager *appMan, int *param1);
10+
int VisualCompetition_Main(ApplicationManager *appMan, int *param1);
11+
int VisualCompetition_Exit(ApplicationManager *appMan, int *param1);
1212
void ov22_022577EC(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, int *param5, int *param6);
1313

1414
#endif // POKEPLATINUM_OV22_02255D44_H

‎include/scrcmd_contests.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
BOOL ScrCmd_StartContestCommSync(ScriptContext *ctx);
77
BOOL ScrCmd_WaitForCommSyncState(ScriptContext *ctx);
8-
BOOL ScrCmd_ContestNew(ScriptContext *ctx);
8+
BOOL ScrCmd_NewContest(ScriptContext *ctx);
99
BOOL ScrCmd_EndContest(ScriptContext *ctx);
1010
BOOL ScrCmd_BufferJudgeName(ScriptContext *ctx);
1111
BOOL ScrCmd_BufferContestantTrainerName(ScriptContext *ctx);
@@ -32,8 +32,8 @@ BOOL ScrCmd_LockAutoScrollForLinkContests(ScriptContext *ctx);
3232
BOOL ScrCmd_LockTextSpeed(ScriptContext *ctx);
3333
BOOL ScrCmd_StartContestCameraFlashTask(ScriptContext *ctx);
3434
BOOL ScrCmd_WaitForContestCameraFlashTask(ScriptContext *ctx);
35-
BOOL ScrCmd_HBlankSystem_Stop(ScriptContext *ctx);
36-
BOOL ScrCmd_HBlankSystem_Start(ScriptContext *ctx);
35+
BOOL ScrCmd_StopHBlank(ScriptContext *ctx);
36+
BOOL ScrCmd_StartHBlank(ScriptContext *ctx);
3737
BOOL ScrCmd_GetShouldSkipAwardCeremony(ScriptContext *ctx);
3838
BOOL ScrCmd_ShowLinkContestRecords(ScriptContext *ctx);
3939

‎res/field/scripts/scripts_contests.s‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ ContestRegistration_ReceptionistLinkContest_End:
538538
End
539539

540540
ContestRegistration_StartContest:
541-
ContestNew VAR_0x8004, VAR_0x8005, VAR_0x8007, VAR_MAP_LOCAL_2
541+
NewContest VAR_0x8004, VAR_0x8005, VAR_0x8007, VAR_MAP_LOCAL_2
542542
CallIfEq VAR_MAP_LOCAL_3, CONTEST_MODE_LINK, ContestRegistration_SetupLinkContest
543543
GoToIfEq VAR_MAP_LOCAL_3, CONTEST_MODE_PRACTICE, ContestRegistration_RegisteredForPractice
544544
GetContestRegistrationEntryNum VAR_RESULT
@@ -683,10 +683,10 @@ Contest_DoContest:
683683
Warp MAP_HEADER_CONTEST_HALL_STAGE_ONGOING_CONTEST, 0, 29, 7, 0
684684
LockAutoScrollForLinkContests
685685
GetContestMode VAR_MAP_LOCAL_3
686-
HBlankSystem_Stop
686+
StopHBlank
687687
FadeScreenIn
688688
WaitFadeScreen
689-
HBlankSystem_Start
689+
StartHBlank
690690
StartContestCommSync 3
691691
WaitForCommSyncState 3
692692
PlayFanfare SEQ_SE_DP_CON_F007
@@ -744,10 +744,10 @@ Contest_DoContest:
744744
WaitForCommSyncState 4
745745
PlayFanfare SEQ_SE_DP_CON_F007
746746
WaitTime 30, VAR_RESULT
747-
HBlankSystem_Stop
747+
StopHBlank
748748
FadeScreen FADE_SCREEN_CMD_STEPS, FADE_SCREEN_SPEED_FAST, FADE_TYPE_UNK_20, COLOR_BLACK
749749
WaitFadeScreen
750-
HBlankSystem_Start
750+
StartHBlank
751751
DestroyNetworkIcon
752752
RunContestApplication
753753
LockAutoScrollForLinkContests
@@ -763,7 +763,7 @@ Contest_DoContest:
763763
Call OngoingContest_PlayApplause
764764
WaitForContestCameraFlashTask
765765
MessageSynchronized ContestRegistration_Text_Congratulations2
766-
ScrCmd_GetShouldSkipAwardCeremony VAR_RESULT
766+
GetShouldSkipAwardCeremony VAR_RESULT
767767
GoToIfEq VAR_RESULT, TRUE, OngoingContest_EndContest
768768
BufferWinningContestantTrainerName 0
769769
BufferWinningContestantMonName 1
@@ -800,10 +800,10 @@ OngoingContest_EndContest:
800800
ScrCmd_2BB
801801
WaitTime 10, VAR_RESULT
802802
DestroyNetworkIcon
803-
HBlankSystem_Stop
803+
StopHBlank
804804
FadeScreen FADE_SCREEN_CMD_STEPS, FADE_SCREEN_SPEED_FAST, FADE_TYPE_UNK_20, COLOR_BLACK
805805
WaitFadeScreen
806-
HBlankSystem_Start
806+
StartHBlank
807807
GetContestInfo VAR_0x8004, VAR_0x8005, VAR_0x8007, VAR_MAP_LOCAL_2
808808
GetFirstTimeVictoryAccessory VAR_0x8004
809809
LockTextSpeed

‎src/overlay017/ov17_0223B140.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ static const SpriteResourceCapacities Unk_ov17_02252DB0 = {
134134
0x8
135135
};
136136

137-
int ActingCompetitionInit(ApplicationManager *appMan, int *param1)
137+
int ActingCompetition_Init(ApplicationManager *appMan, int *param1)
138138
{
139139
UnkStruct_ov17_02246F24 *v0;
140140

@@ -256,7 +256,7 @@ int ActingCompetitionInit(ApplicationManager *appMan, int *param1)
256256
return 1;
257257
}
258258

259-
int ActingCompetitionMain(ApplicationManager *appMan, int *param1)
259+
int ActingCompetition_Main(ApplicationManager *appMan, int *param1)
260260
{
261261
UnkStruct_ov17_02246F24 *v0 = ApplicationManager_Data(appMan);
262262
int v1;
@@ -310,7 +310,7 @@ int ActingCompetitionMain(ApplicationManager *appMan, int *param1)
310310
return 0;
311311
}
312312

313-
int ActingCompetitionExit(ApplicationManager *appMan, int *param1)
313+
int ActingCompetition_Exit(ApplicationManager *appMan, int *param1)
314314
{
315315
UnkStruct_ov17_02246F24 *v0 = ApplicationManager_Data(appMan);
316316
int v1;

‎src/overlay017/ov17_0223CB1C.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ static const SpriteResourceCapacities Unk_ov17_02252EC8 = {
115115
0x8
116116
};
117117

118-
int VisualCompetitonScoringInit(ApplicationManager *appMan, int *param1)
118+
int VisualCompetitonScoring_Init(ApplicationManager *appMan, int *param1)
119119
{
120120
UnkStruct_ov17_02247A48 *v0;
121121

@@ -220,7 +220,7 @@ int VisualCompetitonScoringInit(ApplicationManager *appMan, int *param1)
220220
return 1;
221221
}
222222

223-
int VisualCompetitionScoringMain(ApplicationManager *appMan, int *param1)
223+
int VisualCompetitionScoring_Main(ApplicationManager *appMan, int *param1)
224224
{
225225
UnkStruct_ov17_02247A48 *v0 = ApplicationManager_Data(appMan);
226226
int v1;
@@ -279,7 +279,7 @@ int VisualCompetitionScoringMain(ApplicationManager *appMan, int *param1)
279279
return 0;
280280
}
281281

282-
int VisualCompetitionScoringExit(ApplicationManager *appMan, int *param1)
282+
int VisualCompetitionScoring_Exit(ApplicationManager *appMan, int *param1)
283283
{
284284
UnkStruct_ov17_02247A48 *v0 = ApplicationManager_Data(appMan);
285285
int v1;

0 commit comments

Comments
 (0)