summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-08-11 14:58:51 -0700
committerDiegoisawesome <diego@domoreaweso.me>2018-08-11 14:59:43 -0700
commit658f9351fe9349eb16edab8d5d503ef741449d4a (patch)
tree86d8df6b8f4831eeb9ead1ccfcb89704d681cd96
parentb54793be91b1937d059751ea928112052a2429e0 (diff)
Rename some specials
-rw-r--r--asm/script_menu.s8
-rw-r--r--data/event_scripts.s2
-rw-r--r--data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc2
-rw-r--r--data/scripts/mauville_man.inc46
-rw-r--r--data/specials.inc46
-rw-r--r--include/mauville_old_man.h2
-rw-r--r--include/wild_encounter.h2
-rw-r--r--src/hof_pc.c4
-rw-r--r--src/mauville_old_man.c36
-rw-r--r--src/trader.c12
10 files changed, 80 insertions, 80 deletions
diff --git a/asm/script_menu.s b/asm/script_menu.s
index 670740a77..b56b0749c 100644
--- a/asm/script_menu.s
+++ b/asm/script_menu.s
@@ -676,9 +676,9 @@ _080E2360:
.pool
thumb_func_end sub_80E2308
- thumb_func_start ScrSpecial_CreatePCMenu
-@ bool ScrSpecial_CreatePCMenu()
-ScrSpecial_CreatePCMenu: @ 80E236C
+ thumb_func_start Special_CreatePCMenu
+@ bool Special_CreatePCMenu()
+Special_CreatePCMenu: @ 80E236C
push {lr}
ldr r0, =sub_80E2058
bl FuncIsActiveTask
@@ -698,7 +698,7 @@ _080E2394:
_080E2396:
pop {r1}
bx r1
- thumb_func_end ScrSpecial_CreatePCMenu
+ thumb_func_end Special_CreatePCMenu
thumb_func_start CreatePCMenu
CreatePCMenu: @ 80E239C
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 7dbe3fd01..0d766d70b 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1772,7 +1772,7 @@ EventScript_271D92:: @ 8271D92
EventScript_271DAC:: @ 8271DAC
message gUnknown_0827266F
waitmessage
- special ScrSpecial_CreatePCMenu
+ special Special_CreatePCMenu
waitstate
goto EventScript_271DBC
end
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
index fb76a5fc7..8472f4caa 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
@@ -10,7 +10,7 @@ MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66
end
MauvilleCity_PokemonCenter_1F_EventScript_210E74:: @ 8210E74
- special ScrSpecial_SetMauvilleOldManEventObjGfx
+ special Special_SetMauvilleOldManEventObjGfx
end
MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index 46be101e1..186361a00 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -1,5 +1,5 @@
MauvilleCity_PokemonCenter_1F_EventScript_28E066:: @ 828E066
- special ScrSpecial_GetCurrentMauvilleMan
+ special Special_GetCurrentMauvilleMan
switch VAR_RESULT
case 0, MauvilleCity_PokemonCenter_1F_EventScript_28E0A6
case 1, MauvilleCity_PokemonCenter_1F_EventScript_28E167
@@ -20,9 +20,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0A6:: @ 828E0A6
MauvilleCity_PokemonCenter_1F_EventScript_28E0C7:: @ 828E0C7
setvar VAR_0x8004, 0
- special ScrSpecial_PlayBardSong
+ special Special_PlayBardSong
delay 60
- special ScrSpecial_HasBardSongBeenChanged
+ special Special_HasBardSongBeenChanged
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0F4
msgbox MauvilleCity_PokemonCenter_1F_Text_2903E6, 4
@@ -51,12 +51,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D
msgbox MauvilleCity_PokemonCenter_1F_Text_2904C1, 4
setvar VAR_0x8004, 1
- special ScrSpecial_PlayBardSong
+ special Special_PlayBardSong
delay 60
msgbox MauvilleCity_PokemonCenter_1F_Text_2904EB, 5
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113
- special ScrSpecial_SaveBardSongLyrics
+ special Special_SaveBardSongLyrics
msgbox MauvilleCity_PokemonCenter_1F_Text_290514, 4
release
end
@@ -71,7 +71,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167
faceplayer
setflag FLAG_SYS_HIPSTER_MEET
msgbox MauvilleCity_PokemonCenter_1F_Text_29054C, 4
- special ScrSpecial_GetHipsterSpokenFlag
+ special Special_GetHipsterSpokenFlag
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E18C
msgbox MauvilleCity_PokemonCenter_1F_Text_290598, 4
@@ -79,7 +79,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167
end
MauvilleCity_PokemonCenter_1F_EventScript_28E18C:: @ 828E18C
- special ScrSpecial_HipsterTeachWord
+ special Special_HipsterTeachWord
compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E1A4
msgbox MauvilleCity_PokemonCenter_1F_Text_290602, 4
@@ -88,7 +88,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E18C:: @ 828E18C
MauvilleCity_PokemonCenter_1F_EventScript_28E1A4:: @ 828E1A4
msgbox MauvilleCity_PokemonCenter_1F_Text_290666, 4
- special ScrSpecial_SetHipsterSpokenFlag
+ special Special_SetHipsterSpokenFlag
release
end
@@ -157,7 +157,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E4D4:: @ 828E4D4
msgbox MauvilleCity_PokemonCenter_1F_Text_28E1B1, 5
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503
- special ScrSpecial_GetTraderTradedFlag
+ special Special_GetTraderTradedFlag
compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E50D
message MauvilleCity_PokemonCenter_1F_Text_28E23F
@@ -176,7 +176,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E50D:: @ 828E50D
end
MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517
- special ScrSpecial_TraderMenuGetDecoration
+ special Special_TraderMenuGetDecoration
waitstate
compare VAR_0x8004, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E558
@@ -185,7 +185,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517
msgbox MauvilleCity_PokemonCenter_1F_Text_28E2A9, 5
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E
- special ScrSpecial_DoesPlayerHaveNoDecorations
+ special Special_DoesPlayerHaveNoDecorations
compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E57A
goto MauvilleCity_PokemonCenter_1F_EventScript_28E584
@@ -215,19 +215,19 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E57A:: @ 828E57A
MauvilleCity_PokemonCenter_1F_EventScript_28E584:: @ 828E584
msgbox MauvilleCity_PokemonCenter_1F_Text_28E323, 4
- special ScrSpecial_TraderMenuGiveDecoration
+ special Special_TraderMenuGiveDecoration
waitstate
compare VAR_0x8006, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5D4
compare VAR_0x8006, 65535
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5DE
- special ScrSpecial_IsDecorationFull
+ special Special_IsDecorationFull
compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5EC
msgbox MauvilleCity_PokemonCenter_1F_Text_28E3C4, 5
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584
- special ScrSpecial_TraderDoDecorationTrade
+ special Special_TraderDoDecorationTrade
msgbox MauvilleCity_PokemonCenter_1F_Text_28E424, 4
release
end
@@ -813,20 +813,20 @@ MauvilleCity_PokemonCenter_1F_EventScript_29014A:: @ 829014A
msgbox MauvilleCity_PokemonCenter_1F_Text_28E5F6, 5
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219
- specialvar VAR_RESULT, ScrSpecial_StorytellerGetFreeStorySlot
+ specialvar VAR_RESULT, Special_StorytellerGetFreeStorySlot
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901DA
message MauvilleCity_PokemonCenter_1F_Text_28E673
waitmessage
- special ScrSpecial_StorytellerStoryListMenu
+ special Special_StorytellerStoryListMenu
waitstate
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901B7
setvar VAR_0x8008, 1
- special ScrSpecial_StorytellerDisplayStory
+ special Special_StorytellerDisplayStory
waitmessage
waitbuttonpress
- specialvar VAR_RESULT, ScrSpecial_StorytellerUpdateStat
+ specialvar VAR_RESULT, Special_StorytellerUpdateStat
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901BD
goto MauvilleCity_PokemonCenter_1F_EventScript_29020F
@@ -837,7 +837,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_2901B7:: @ 82901B7
MauvilleCity_PokemonCenter_1F_EventScript_2901BD:: @ 82901BD
msgbox MauvilleCity_PokemonCenter_1F_Text_28E78A, 4
- specialvar VAR_RESULT, ScrSpecial_HasStorytellerAlreadyRecorded
+ specialvar VAR_RESULT, Special_HasStorytellerAlreadyRecorded
compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29022D
goto MauvilleCity_PokemonCenter_1F_EventScript_2901E2
@@ -849,7 +849,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_2901E2:: @ 82901E2
msgbox MauvilleCity_PokemonCenter_1F_Text_28E7EE, 5
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219
- specialvar VAR_RESULT, ScrSpecial_StorytellerInitializeRandomStat
+ specialvar VAR_RESULT, Special_StorytellerInitializeRandomStat
compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29020F
msgbox MauvilleCity_PokemonCenter_1F_Text_28E881, 4
@@ -903,7 +903,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_2902F6:: @ 82902F6
end
MauvilleCity_PokemonCenter_1F_EventScript_290317:: @ 8290317
- special ScrSpecial_GiddyShouldTellAnotherTale
+ special Special_GiddyShouldTellAnotherTale
compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290359
compare VAR_RESULT, 0
@@ -911,7 +911,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_290317:: @ 8290317
end
MauvilleCity_PokemonCenter_1F_EventScript_290331:: @ 8290331
- special ScrSpecial_GiddyShouldTellAnotherTale
+ special Special_GiddyShouldTellAnotherTale
compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29034B
compare VAR_RESULT, 0
@@ -924,7 +924,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_29034B:: @ 829034B
end
MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359
- special ScrSpecial_GenerateGiddyLine
+ special Special_GenerateGiddyLine
special ShowFieldMessageStringVar4
waitmessage
yesnobox 20, 8
diff --git a/data/specials.inc b/data/specials.inc
index 86355f484..35b70b5c9 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -108,28 +108,28 @@ gSpecials:: @ 81DBA64
def_special sub_80FAFF8
def_special easy_chat_input_maybe
def_special sub_811EECC
- def_special ScrSpecial_GetCurrentMauvilleMan
- def_special ScrSpecial_HasBardSongBeenChanged
- def_special ScrSpecial_SaveBardSongLyrics
- def_special ScrSpecial_GetHipsterSpokenFlag
- def_special ScrSpecial_SetHipsterSpokenFlag
- def_special ScrSpecial_HipsterTeachWord
- def_special ScrSpecial_PlayBardSong
- def_special ScrSpecial_SetMauvilleOldManEventObjGfx
- def_special ScrSpecial_GenerateGiddyLine
- def_special ScrSpecial_GiddyShouldTellAnotherTale
- def_special ScrSpecial_StorytellerGetFreeStorySlot
- def_special ScrSpecial_StorytellerDisplayStory
- def_special ScrSpecial_StorytellerStoryListMenu
- def_special ScrSpecial_StorytellerUpdateStat
- def_special ScrSpecial_StorytellerInitializeRandomStat
- def_special ScrSpecial_HasStorytellerAlreadyRecorded
- def_special ScrSpecial_TraderMenuGetDecoration
- def_special ScrSpecial_GetTraderTradedFlag
- def_special ScrSpecial_DoesPlayerHaveNoDecorations
- def_special ScrSpecial_IsDecorationFull
- def_special ScrSpecial_TraderMenuGiveDecoration
- def_special ScrSpecial_TraderDoDecorationTrade
+ def_special Special_GetCurrentMauvilleMan
+ def_special Special_HasBardSongBeenChanged
+ def_special Special_SaveBardSongLyrics
+ def_special Special_GetHipsterSpokenFlag
+ def_special Special_SetHipsterSpokenFlag
+ def_special Special_HipsterTeachWord
+ def_special Special_PlayBardSong
+ def_special Special_SetMauvilleOldManEventObjGfx
+ def_special Special_GenerateGiddyLine
+ def_special Special_GiddyShouldTellAnotherTale
+ def_special Special_StorytellerGetFreeStorySlot
+ def_special Special_StorytellerDisplayStory
+ def_special Special_StorytellerStoryListMenu
+ def_special Special_StorytellerUpdateStat
+ def_special Special_StorytellerInitializeRandomStat
+ def_special Special_HasStorytellerAlreadyRecorded
+ def_special Special_TraderMenuGetDecoration
+ def_special Special_GetTraderTradedFlag
+ def_special Special_DoesPlayerHaveNoDecorations
+ def_special Special_IsDecorationFull
+ def_special Special_TraderMenuGiveDecoration
+ def_special Special_TraderDoDecorationTrade
def_special GetSeedotSizeRecordInfo
def_special CompareSeedotSize
def_special GetLotadSizeRecordInfo
@@ -273,7 +273,7 @@ gSpecials:: @ 81DBA64
def_special ShowBerryBlenderRecordWindow
def_special ResetTrickHouseEndRoomFlag
def_special SetTrickHouseEndRoomFlag
- def_special ScrSpecial_CreatePCMenu
+ def_special Special_CreatePCMenu
def_special AccessHallOfFamePC
def_special Special_ShowDiploma
def_special CheckLeadMonCool
diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h
index 9d71e81aa..dd7d5c4e0 100644
--- a/include/mauville_old_man.h
+++ b/include/mauville_old_man.h
@@ -15,7 +15,7 @@ extern struct BardSong gBardSong;
void SetMauvilleOldMan(void);
u8 GetCurrentMauvilleOldMan(void);
-void ScrSpecial_SetMauvilleOldManEventObjGfx(void);
+void Special_SetMauvilleOldManEventObjGfx(void);
u8 sub_81201C8(void);
void sub_8120B70(OldMan *dest);
void sub_8120670(void);
diff --git a/include/wild_encounter.h b/include/wild_encounter.h
index 55bbaa7dd..14a28ee7e 100644
--- a/include/wild_encounter.h
+++ b/include/wild_encounter.h
@@ -33,7 +33,7 @@ extern const struct WildPokemonHeader gWildMonHeaders[];
void DisableWildEncounters(bool8 disabled);
bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavior);
-void ScrSpecial_RockSmashWildEncounter(void);
+void Special_RockSmashWildEncounter(void);
bool8 SweetScentWildEncounter(void);
bool8 DoesCurrentMapHaveFishingMons(void);
void FishingWildEncounter(u8 rod);
diff --git a/src/hof_pc.c b/src/hof_pc.c
index 44b929337..38bf26c65 100644
--- a/src/hof_pc.c
+++ b/src/hof_pc.c
@@ -10,7 +10,7 @@
extern void (*gUnknown_0300485C)(void);
extern void Overworld_PlaySpecialMapMusic(void);
-extern bool16 ScrSpecial_CreatePCMenu(void);
+extern bool16 Special_CreatePCMenu(void);
extern void ScriptMenu_DisplayPCStartupPrompt(void);
static void ReshowPCMenuAfterHallOfFamePC(void);
@@ -32,7 +32,7 @@ static void ReshowPCMenuAfterHallOfFamePC(void)
{
ScriptContext2_Enable();
Overworld_PlaySpecialMapMusic();
- ScrSpecial_CreatePCMenu();
+ Special_CreatePCMenu();
ScriptMenu_DisplayPCStartupPrompt();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
CreateTask(Task_WaitForPaletteFade, 10);
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index 591e3ad9a..752e19e9c 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -136,7 +136,7 @@ void SetMauvilleOldMan(void)
SetupGiddy();
break;
}
- ScrSpecial_SetMauvilleOldManEventObjGfx();
+ Special_SetMauvilleOldManEventObjGfx();
}
u8 GetCurrentMauvilleOldMan(void)
@@ -146,12 +146,12 @@ u8 GetCurrentMauvilleOldMan(void)
return common->id;
}
-void ScrSpecial_GetCurrentMauvilleMan(void)
+void Special_GetCurrentMauvilleMan(void)
{
gSpecialVar_Result = GetCurrentMauvilleOldMan();
}
-void ScrSpecial_HasBardSongBeenChanged(void)
+void Special_HasBardSongBeenChanged(void)
{
u16 *scriptResult = &gSpecialVar_Result; // why??
struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard;
@@ -159,7 +159,7 @@ void ScrSpecial_HasBardSongBeenChanged(void)
*scriptResult = bard->hasChangedSong;
}
-void ScrSpecial_SaveBardSongLyrics(void)
+void Special_SaveBardSongLyrics(void)
{
u16 i;
struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard;
@@ -225,13 +225,13 @@ static void PrepareSongText(void)
}
}
-void ScrSpecial_PlayBardSong(void)
+void Special_PlayBardSong(void)
{
StartBardSong(gSpecialVar_0x8004);
ScriptContext1_Stop();
}
-void ScrSpecial_GetHipsterSpokenFlag(void)
+void Special_GetHipsterSpokenFlag(void)
{
u16 *scriptResult = &gSpecialVar_Result; // again??
struct MauvilleManHipster *hipster = &gSaveBlock1Ptr->oldMan.hipster;
@@ -239,14 +239,14 @@ void ScrSpecial_GetHipsterSpokenFlag(void)
*scriptResult = hipster->alreadySpoken;
}
-void ScrSpecial_SetHipsterSpokenFlag(void)
+void Special_SetHipsterSpokenFlag(void)
{
struct MauvilleManHipster *hipster = &gSaveBlock1Ptr->oldMan.hipster;
hipster->alreadySpoken = TRUE;
}
-void ScrSpecial_HipsterTeachWord(void)
+void Special_HipsterTeachWord(void)
{
u16 var = sub_811F01C();
@@ -261,7 +261,7 @@ void ScrSpecial_HipsterTeachWord(void)
}
}
-void ScrSpecial_GiddyShouldTellAnotherTale(void)
+void Special_GiddyShouldTellAnotherTale(void)
{
struct MauvilleManGiddy *giddy = &gSaveBlock1Ptr->oldMan.giddy;
@@ -276,7 +276,7 @@ void ScrSpecial_GiddyShouldTellAnotherTale(void)
}
}
-void ScrSpecial_GenerateGiddyLine(void)
+void Special_GenerateGiddyLine(void)
{
struct MauvilleManGiddy *giddy = &gSaveBlock1Ptr->oldMan.giddy;
@@ -406,7 +406,7 @@ void ResetMauvilleOldManFlag(void)
case MAUVILLE_MAN_GIDDY:
break;
}
- ScrSpecial_SetMauvilleOldManEventObjGfx();
+ Special_SetMauvilleOldManEventObjGfx();
}
@@ -671,7 +671,7 @@ static void Task_BardSong(u8 taskId)
sub_8197224();
}
-void ScrSpecial_SetMauvilleOldManEventObjGfx(void)
+void Special_SetMauvilleOldManEventObjGfx(void)
{
VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BARD);
}
@@ -1199,24 +1199,24 @@ static void Task_StoryListMenu(u8 taskId) // Task_StoryListMenu
}
// Sets gSpecialVar_Result to TRUE if player selected a story
-void ScrSpecial_StorytellerStoryListMenu(void)
+void Special_StorytellerStoryListMenu(void)
{
CreateTask(Task_StoryListMenu, 80);
}
-void ScrSpecial_StorytellerDisplayStory(void)
+void Special_StorytellerDisplayStory(void)
{
StorytellerDisplayStory(sSelectedStory);
}
-u8 ScrSpecial_StorytellerGetFreeStorySlot(void)
+u8 Special_StorytellerGetFreeStorySlot(void)
{
sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller;
return GetFreeStorySlot();
}
// Returns TRUE if stat has increased
-bool8 ScrSpecial_StorytellerUpdateStat(void)
+bool8 Special_StorytellerUpdateStat(void)
{
u8 r4;
sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller;
@@ -1230,7 +1230,7 @@ bool8 ScrSpecial_StorytellerUpdateStat(void)
return FALSE;
}
-bool8 ScrSpecial_HasStorytellerAlreadyRecorded(void)
+bool8 Special_HasStorytellerAlreadyRecorded(void)
{
sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller;
@@ -1240,7 +1240,7 @@ bool8 ScrSpecial_HasStorytellerAlreadyRecorded(void)
return TRUE;
}
-bool8 ScrSpecial_StorytellerInitializeRandomStat(void)
+bool8 Special_StorytellerInitializeRandomStat(void)
{
sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller;
return StorytellerInitializeRandomStat();
diff --git a/src/trader.c b/src/trader.c
index c4d70ac9a..2cb74b23c 100644
--- a/src/trader.c
+++ b/src/trader.c
@@ -130,13 +130,13 @@ void Task_HandleGetDecorationMenuInput(u8 taskId)
}
}
-void ScrSpecial_GetTraderTradedFlag(void)
+void Special_GetTraderTradedFlag(void)
{
struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader;
gSpecialVar_Result = trader->alreadyTraded;
}
-void ScrSpecial_DoesPlayerHaveNoDecorations(void)
+void Special_DoesPlayerHaveNoDecorations(void)
{
u8 i;
@@ -151,7 +151,7 @@ void ScrSpecial_DoesPlayerHaveNoDecorations(void)
gSpecialVar_Result = TRUE;
}
-void ScrSpecial_IsDecorationFull(void)
+void Special_IsDecorationFull(void)
{
gSpecialVar_Result = FALSE;
if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category
@@ -162,7 +162,7 @@ void ScrSpecial_IsDecorationFull(void)
}
}
-void ScrSpecial_TraderMenuGiveDecoration(void)
+void Special_TraderMenuGiveDecoration(void)
{
CreateTask(sub_8127208, 0);
}
@@ -190,7 +190,7 @@ void sub_8133E1C(u8 taskId)
EnableBothScriptContexts();
}
-void ScrSpecial_TraderDoDecorationTrade(void)
+void Special_TraderDoDecorationTrade(void)
{
struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader;
@@ -202,7 +202,7 @@ void ScrSpecial_TraderDoDecorationTrade(void)
trader->alreadyTraded = TRUE;
}
-void ScrSpecial_TraderMenuGetDecoration(void)
+void Special_TraderMenuGetDecoration(void)
{
u8 taskId = CreateTask(Task_HandleGetDecorationMenuInput, 0);
CreateAvailableDecorationsMenu(taskId);