summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/quest_log.c4
-rw-r--r--src/script_menu.c32
-rw-r--r--src/seagallop.c38
3 files changed, 37 insertions, 37 deletions
diff --git a/src/quest_log.c b/src/quest_log.c
index a51def1b9..14485ca46 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -438,7 +438,7 @@ void sub_811089C(void)
memset(gSaveBlock1Ptr->questLog, 0, sizeof(gSaveBlock1Ptr->questLog));
gUnknown_203ADF8 = 0;
gUnknown_203ADFA = 0;
- sQuestLogCB = 0;
+ sQuestLogCB = NULL;
gUnknown_203AE08 = NULL;
gUnknown_203AE04 = NULL;
sub_8113BD8();
@@ -458,7 +458,7 @@ void sub_8110920(void)
void RunQuestLogCB(void)
{
- if (sQuestLogCB)
+ if (sQuestLogCB != NULL)
sQuestLogCB();
}
diff --git a/src/script_menu.c b/src/script_menu.c
index 08baed433..ed2f0aa0a 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -21,11 +21,11 @@
struct MultichoiceListStruct
{
- const struct MenuAction *list;
+ const struct MenuAction * list;
u8 count;
};
-EWRAM_DATA u8 sDelay = 0;
+static EWRAM_DATA u8 sDelay = 0;
static void DrawVerticalMultichoiceMenu(u8 left, u8 top, u8 mcId, u8 ignoreBpress, u8 initPos);
static u8 sub_809CBB4(u8 count);
@@ -432,35 +432,35 @@ static const struct MenuAction sScriptMultiChoiceMenu_SeviiNavelBirth[] = {
{ gOtherText_Exit }
};
-static const struct MenuAction sScriptMultiChoiceMenu_SeaGallop123[] = {
+static const struct MenuAction sScriptMultiChoiceMenu_Seagallop123[] = {
{ gText_OneIsland },
{ gText_TwoIsland },
{ gText_ThreeIsland },
{ gOtherText_Exit }
};
-static const struct MenuAction sScriptMultiChoiceMenu_SeaGallopV23[] = {
+static const struct MenuAction sScriptMultiChoiceMenu_SeagallopV23[] = {
{ gText_Vermilion },
{ gText_TwoIsland },
{ gText_ThreeIsland },
{ gOtherText_Exit }
};
-static const struct MenuAction sScriptMultiChoiceMenu_SeaGallopV13[] = {
+static const struct MenuAction sScriptMultiChoiceMenu_SeagallopV13[] = {
{ gText_Vermilion },
{ gText_OneIsland },
{ gText_ThreeIsland },
{ gOtherText_Exit }
};
-static const struct MenuAction sScriptMultiChoiceMenu_SeaGallopV12[] = {
+static const struct MenuAction sScriptMultiChoiceMenu_SeagallopV12[] = {
{ gText_Vermilion },
{ gText_OneIsland },
{ gText_TwoIsland },
{ gOtherText_Exit }
};
-static const struct MenuAction sScriptMultiChoiceMenu_SeaGallopVermilion[] = {
+static const struct MenuAction sScriptMultiChoiceMenu_SeagallopVermilion[] = {
{ gText_Vermilion },
{ gOtherText_Exit }
};
@@ -547,11 +547,11 @@ const struct MultichoiceListStruct gScriptMultiChoiceMenus[] = {
{ sScriptMultiChoiceMenu_SeviiNavel, NELEMS(sScriptMultiChoiceMenu_SeviiNavel) },
{ sScriptMultiChoiceMenu_SeviiBirth, NELEMS(sScriptMultiChoiceMenu_SeviiBirth) },
{ sScriptMultiChoiceMenu_SeviiNavelBirth, NELEMS(sScriptMultiChoiceMenu_SeviiNavelBirth) },
- { sScriptMultiChoiceMenu_SeaGallop123, NELEMS(sScriptMultiChoiceMenu_SeaGallop123) },
- { sScriptMultiChoiceMenu_SeaGallopV23, NELEMS(sScriptMultiChoiceMenu_SeaGallopV23) },
- { sScriptMultiChoiceMenu_SeaGallopV13, NELEMS(sScriptMultiChoiceMenu_SeaGallopV13) },
- { sScriptMultiChoiceMenu_SeaGallopV12, NELEMS(sScriptMultiChoiceMenu_SeaGallopV12) },
- { sScriptMultiChoiceMenu_SeaGallopVermilion, NELEMS(sScriptMultiChoiceMenu_SeaGallopVermilion) },
+ { sScriptMultiChoiceMenu_Seagallop123, NELEMS(sScriptMultiChoiceMenu_Seagallop123) },
+ { sScriptMultiChoiceMenu_SeagallopV23, NELEMS(sScriptMultiChoiceMenu_SeagallopV23) },
+ { sScriptMultiChoiceMenu_SeagallopV13, NELEMS(sScriptMultiChoiceMenu_SeagallopV13) },
+ { sScriptMultiChoiceMenu_SeagallopV12, NELEMS(sScriptMultiChoiceMenu_SeagallopV12) },
+ { sScriptMultiChoiceMenu_SeagallopVermilion, NELEMS(sScriptMultiChoiceMenu_SeagallopVermilion) },
{ sScriptMultiChoiceMenu_62, NELEMS(sScriptMultiChoiceMenu_62) },
{ sScriptMultiChoiceMenu_JoinOrLead, NELEMS(sScriptMultiChoiceMenu_JoinOrLead) },
{ sScriptMultiChoiceMenu_TrainerTowerMode, NELEMS(sScriptMultiChoiceMenu_TrainerTowerMode) }
@@ -647,7 +647,7 @@ static const struct SpriteSheet sMuseumAerodactylSprSheets[] = {
};
-static const u8 *const sSeaGallopDestStrings[] = {
+static const u8 *const sSeagallopDestStrings[] = {
gText_Vermilion,
gText_OneIsland,
gText_TwoIsland,
@@ -1188,7 +1188,7 @@ void QLPlaybackCB_DestroyScriptMenuMonPicSprites(void)
}
}
-void Special_DrawSeaGallopDestinationMenu(void)
+void Special_DrawSeagallopDestinationMenu(void)
{
// 8004 = Starting location
// 8005 = Page (0: Verm, One, Two, Three, Four, Other, Exit; 1: Four, Five, Six, Seven, Other, Exit)
@@ -1224,7 +1224,7 @@ void Special_DrawSeaGallopDestinationMenu(void)
for (i = 0; i < nitems - 2; i++)
{
if (r4 != gSpecialVar_0x8004)
- AddTextPrinterParameterized(windowId, 2, sSeaGallopDestStrings[r4], cursorWidth, i * 16 + 2, 0xFF, NULL);
+ AddTextPrinterParameterized(windowId, 2, sSeagallopDestStrings[r4], cursorWidth, i * 16 + 2, 0xFF, NULL);
else
i--;
r4++;
@@ -1240,7 +1240,7 @@ void Special_DrawSeaGallopDestinationMenu(void)
}
}
-u16 Special_GetSelectedSeaGallopDestination(void)
+u16 Special_GetSelectedSeagallopDestination(void)
{
// 8004 = Starting location
// 8005 = Page (0: Verm, One, Two, Three, Four, Other, Exit; 1: Four, Five, Six, Seven, Other, Exit)
diff --git a/src/seagallop.c b/src/seagallop.c
index 006a356e4..cf07f9880 100644
--- a/src/seagallop.c
+++ b/src/seagallop.c
@@ -25,13 +25,13 @@
static EWRAM_DATA void * sBg3TilemapBuffer = NULL;
-static void CB2_SetUpSeaGallopScene(void);
+static void CB2_SetUpSeagallopScene(void);
static void VBlankCB_SeaGallop(void);
static void MainCB2_SeaGallop(void);
-static void Task_SeaGallop_0(u8 taskId);
-static void Task_SeaGallop_1(u8 taskId);
-static void Task_SeaGallop_2(u8 taskId);
-static void Task_SeaGallop_3(void);
+static void Task_Seagallop_0(u8 taskId);
+static void Task_Seagallop_1(u8 taskId);
+static void Task_Seagallop_2(u8 taskId);
+static void Task_Seagallop_3(void);
static void ResetGPU(void);
static void ResetAllAssets(void);
static void SetDispcnt(void);
@@ -64,7 +64,7 @@ static const struct BgTemplate sBGTemplates[] = {
}
};
-static const s8 sSeaGallopSpawnTable[][4] = {
+static const s8 sSeag[][4] = {
// Map X Y
[SEAGALLOP_VERMILION_CITY] = {MAP(VERMILION_CITY), 0x17, 0x20},
[SEAGALLOP_ONE_ISLAND] = {MAP(ONE_ISLAND_HARBOR), 0x08, 0x05},
@@ -176,14 +176,14 @@ static const struct SpriteTemplate sWakeSpriteTemplate = {
SpriteCB_Wake
};
-void ScrSpecial_SeaGallopFerry(void)
+void ScrSpecial_SeagallopFerry(void)
{
SetVBlankCallback(NULL);
HelpSystem_Disable();
- SetMainCallback2(CB2_SetUpSeaGallopScene);
+ SetMainCallback2(CB2_SetUpSeagallopScene);
}
-static void CB2_SetUpSeaGallopScene(void)
+static void CB2_SetUpSeagallopScene(void)
{
void ** ptr;
switch (gMain.state)
@@ -248,7 +248,7 @@ static void CB2_SetUpSeaGallopScene(void)
SetGpuReg(REG_OFFSET_WINOUT, 0x00);
SetGpuReg(REG_OFFSET_WIN0H, 0x00F0);
SetGpuReg(REG_OFFSET_WIN0V, 0x1888);
- CreateTask(Task_SeaGallop_0, 8);
+ CreateTask(Task_Seagallop_0, 8);
SetMainCallback2(MainCB2_SeaGallop);
gMain.state = 0;
break;
@@ -270,9 +270,9 @@ static void MainCB2_SeaGallop(void)
UpdatePaletteFade();
}
-static void Task_SeaGallop_0(u8 taskId)
+static void Task_Seagallop_0(u8 taskId)
{
- gTasks[taskId].func = Task_SeaGallop_1;
+ gTasks[taskId].func = Task_Seagallop_1;
}
static void ScrollBG(void)
@@ -287,7 +287,7 @@ static void ScrollBG(void)
}
}
-static void Task_SeaGallop_1(u8 taskId)
+static void Task_Seagallop_1(u8 taskId)
{
struct Task * task = &gTasks[taskId];
@@ -296,29 +296,29 @@ static void Task_SeaGallop_1(u8 taskId)
{
Overworld_FadeOutMapMusic();
sub_807DC18();
- task->func = Task_SeaGallop_2;
+ task->func = Task_Seagallop_2;
}
}
-static void Task_SeaGallop_2(u8 taskId)
+static void Task_Seagallop_2(u8 taskId)
{
ScrollBG();
if (sub_8055FC4() && !gPaletteFade.active)
{
- Task_SeaGallop_3();
+ Task_Seagallop_3();
HelpSystem_Enable();
DestroyTask(taskId);
}
}
-static void Task_SeaGallop_3(void)
+static void Task_Seagallop_3(void)
{
const s8 * warpInfo;
- if (gSpecialVar_0x8006 >= NELEMS(sSeaGallopSpawnTable))
+ if (gSpecialVar_0x8006 >= NELEMS(sSeag))
gSpecialVar_0x8006 = 0;
- warpInfo = sSeaGallopSpawnTable[gSpecialVar_0x8006];
+ warpInfo = sSeag[gSpecialVar_0x8006];
SetWarpDestination(warpInfo[0], warpInfo[1], -1, warpInfo[2], warpInfo[3]);
PlayRainStoppingSoundEffect();
PlaySE(SE_KAIDAN);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 16:54:09 +0000