ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Rename some specials"

Browse Source 
This reverts commit 658f9351fe.
This commit is contained in:
Diegoisawesome 2018-08-11 15:16:41 -07:00
parent 658f9351fe
commit cb9127ccaf
10 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/script_menu.s
View File

@ -676,9 +676,9 @@ _080E2360:
.pool .pool
thumb_func_end sub_80E2308 thumb_func_end sub_80E2308
thumb_func_start Special_CreatePCMenu thumb_func_start ScrSpecial_CreatePCMenu
@ bool Special_CreatePCMenu() @ bool ScrSpecial_CreatePCMenu()
Special_CreatePCMenu: @ 80E236C ScrSpecial_CreatePCMenu: @ 80E236C
push {lr} push {lr}
ldr r0, =sub_80E2058 ldr r0, =sub_80E2058
bl FuncIsActiveTask bl FuncIsActiveTask
@ -698,7 +698,7 @@ _080E2394:
_080E2396: _080E2396:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end Special_CreatePCMenu thumb_func_end ScrSpecial_CreatePCMenu
thumb_func_start CreatePCMenu thumb_func_start CreatePCMenu
CreatePCMenu: @ 80E239C CreatePCMenu: @ 80E239C

2
data/event_scripts.s
View File

@ -1772,7 +1772,7 @@ EventScript_271D92:: @ 8271D92
EventScript_271DAC:: @ 8271DAC EventScript_271DAC:: @ 8271DAC
message gUnknown_0827266F message gUnknown_0827266F
waitmessage waitmessage
special Special_CreatePCMenu special ScrSpecial_CreatePCMenu
waitstate waitstate
goto EventScript_271DBC goto EventScript_271DBC
end end

2
data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
View File

@ -10,7 +10,7 @@ MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66
end end
MauvilleCity_PokemonCenter_1F_EventScript_210E74:: @ 8210E74 MauvilleCity_PokemonCenter_1F_EventScript_210E74:: @ 8210E74
special Special_SetMauvilleOldManEventObjGfx special ScrSpecial_SetMauvilleOldManEventObjGfx
end end
MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78 MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78

46
data/scripts/mauville_man.inc
View File

@ -1,5 +1,5 @@
MauvilleCity_PokemonCenter_1F_EventScript_28E066:: @ 828E066 MauvilleCity_PokemonCenter_1F_EventScript_28E066:: @ 828E066
special Special_GetCurrentMauvilleMan special ScrSpecial_GetCurrentMauvilleMan
switch VAR_RESULT switch VAR_RESULT
case 0, MauvilleCity_PokemonCenter_1F_EventScript_28E0A6 case 0, MauvilleCity_PokemonCenter_1F_EventScript_28E0A6
case 1, MauvilleCity_PokemonCenter_1F_EventScript_28E167 case 1, MauvilleCity_PokemonCenter_1F_EventScript_28E167
@ -20,9 +20,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0A6:: @ 828E0A6
MauvilleCity_PokemonCenter_1F_EventScript_28E0C7:: @ 828E0C7 MauvilleCity_PokemonCenter_1F_EventScript_28E0C7:: @ 828E0C7
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special Special_PlayBardSong special ScrSpecial_PlayBardSong
delay 60 delay 60
special Special_HasBardSongBeenChanged special ScrSpecial_HasBardSongBeenChanged
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0F4 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0F4
msgbox MauvilleCity_PokemonCenter_1F_Text_2903E6, 4 msgbox MauvilleCity_PokemonCenter_1F_Text_2903E6, 4
@ -51,12 +51,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D
msgbox MauvilleCity_PokemonCenter_1F_Text_2904C1, 4 msgbox MauvilleCity_PokemonCenter_1F_Text_2904C1, 4
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
special Special_PlayBardSong special ScrSpecial_PlayBardSong
delay 60 delay 60
msgbox MauvilleCity_PokemonCenter_1F_Text_2904EB, 5 msgbox MauvilleCity_PokemonCenter_1F_Text_2904EB, 5
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113
special Special_SaveBardSongLyrics special ScrSpecial_SaveBardSongLyrics
msgbox MauvilleCity_PokemonCenter_1F_Text_290514, 4 msgbox MauvilleCity_PokemonCenter_1F_Text_290514, 4
release release
end end
@ -71,7 +71,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167
faceplayer faceplayer
setflag FLAG_SYS_HIPSTER_MEET setflag FLAG_SYS_HIPSTER_MEET
msgbox MauvilleCity_PokemonCenter_1F_Text_29054C, 4 msgbox MauvilleCity_PokemonCenter_1F_Text_29054C, 4
special Special_GetHipsterSpokenFlag special ScrSpecial_GetHipsterSpokenFlag
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E18C goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E18C
msgbox MauvilleCity_PokemonCenter_1F_Text_290598, 4 msgbox MauvilleCity_PokemonCenter_1F_Text_290598, 4
@ -79,7 +79,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167
end end
MauvilleCity_PokemonCenter_1F_EventScript_28E18C:: @ 828E18C MauvilleCity_PokemonCenter_1F_EventScript_28E18C:: @ 828E18C
special Special_HipsterTeachWord special ScrSpecial_HipsterTeachWord
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E1A4 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E1A4
msgbox MauvilleCity_PokemonCenter_1F_Text_290602, 4 msgbox MauvilleCity_PokemonCenter_1F_Text_290602, 4
@ -88,7 +88,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E18C:: @ 828E18C
MauvilleCity_PokemonCenter_1F_EventScript_28E1A4:: @ 828E1A4 MauvilleCity_PokemonCenter_1F_EventScript_28E1A4:: @ 828E1A4
msgbox MauvilleCity_PokemonCenter_1F_Text_290666, 4 msgbox MauvilleCity_PokemonCenter_1F_Text_290666, 4
special Special_SetHipsterSpokenFlag special ScrSpecial_SetHipsterSpokenFlag
release release
end end
@ -157,7 +157,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E4D4:: @ 828E4D4
msgbox MauvilleCity_PokemonCenter_1F_Text_28E1B1, 5 msgbox MauvilleCity_PokemonCenter_1F_Text_28E1B1, 5
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503
special Special_GetTraderTradedFlag special ScrSpecial_GetTraderTradedFlag
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E50D goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E50D
message MauvilleCity_PokemonCenter_1F_Text_28E23F message MauvilleCity_PokemonCenter_1F_Text_28E23F
@ -176,7 +176,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E50D:: @ 828E50D
end end
MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517 MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517
special Special_TraderMenuGetDecoration special ScrSpecial_TraderMenuGetDecoration
waitstate waitstate
compare VAR_0x8004, 0 compare VAR_0x8004, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E558 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E558
@ -185,7 +185,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517
msgbox MauvilleCity_PokemonCenter_1F_Text_28E2A9, 5 msgbox MauvilleCity_PokemonCenter_1F_Text_28E2A9, 5
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E
special Special_DoesPlayerHaveNoDecorations special ScrSpecial_DoesPlayerHaveNoDecorations
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E57A goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E57A
goto MauvilleCity_PokemonCenter_1F_EventScript_28E584 goto MauvilleCity_PokemonCenter_1F_EventScript_28E584
@ -215,19 +215,19 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E57A:: @ 828E57A
MauvilleCity_PokemonCenter_1F_EventScript_28E584:: @ 828E584 MauvilleCity_PokemonCenter_1F_EventScript_28E584:: @ 828E584
msgbox MauvilleCity_PokemonCenter_1F_Text_28E323, 4 msgbox MauvilleCity_PokemonCenter_1F_Text_28E323, 4
special Special_TraderMenuGiveDecoration special ScrSpecial_TraderMenuGiveDecoration
waitstate waitstate
compare VAR_0x8006, 0 compare VAR_0x8006, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5D4 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5D4
compare VAR_0x8006, 65535 compare VAR_0x8006, 65535
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5DE goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5DE
special Special_IsDecorationFull special ScrSpecial_IsDecorationFull
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5EC goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5EC
msgbox MauvilleCity_PokemonCenter_1F_Text_28E3C4, 5 msgbox MauvilleCity_PokemonCenter_1F_Text_28E3C4, 5
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584
special Special_TraderDoDecorationTrade special ScrSpecial_TraderDoDecorationTrade
msgbox MauvilleCity_PokemonCenter_1F_Text_28E424, 4 msgbox MauvilleCity_PokemonCenter_1F_Text_28E424, 4
release release
end end
@ -813,20 +813,20 @@ MauvilleCity_PokemonCenter_1F_EventScript_29014A:: @ 829014A
msgbox MauvilleCity_PokemonCenter_1F_Text_28E5F6, 5 msgbox MauvilleCity_PokemonCenter_1F_Text_28E5F6, 5
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219
specialvar VAR_RESULT, Special_StorytellerGetFreeStorySlot specialvar VAR_RESULT, ScrSpecial_StorytellerGetFreeStorySlot
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901DA goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901DA
message MauvilleCity_PokemonCenter_1F_Text_28E673 message MauvilleCity_PokemonCenter_1F_Text_28E673
waitmessage waitmessage
special Special_StorytellerStoryListMenu special ScrSpecial_StorytellerStoryListMenu
waitstate waitstate
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901B7 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901B7
setvar VAR_0x8008, 1 setvar VAR_0x8008, 1
special Special_StorytellerDisplayStory special ScrSpecial_StorytellerDisplayStory
waitmessage waitmessage
waitbuttonpress waitbuttonpress
specialvar VAR_RESULT, Special_StorytellerUpdateStat specialvar VAR_RESULT, ScrSpecial_StorytellerUpdateStat
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901BD goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901BD
goto MauvilleCity_PokemonCenter_1F_EventScript_29020F goto MauvilleCity_PokemonCenter_1F_EventScript_29020F
@ -837,7 +837,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_2901B7:: @ 82901B7
MauvilleCity_PokemonCenter_1F_EventScript_2901BD:: @ 82901BD MauvilleCity_PokemonCenter_1F_EventScript_2901BD:: @ 82901BD
msgbox MauvilleCity_PokemonCenter_1F_Text_28E78A, 4 msgbox MauvilleCity_PokemonCenter_1F_Text_28E78A, 4
specialvar VAR_RESULT, Special_HasStorytellerAlreadyRecorded specialvar VAR_RESULT, ScrSpecial_HasStorytellerAlreadyRecorded
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29022D goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29022D
goto MauvilleCity_PokemonCenter_1F_EventScript_2901E2 goto MauvilleCity_PokemonCenter_1F_EventScript_2901E2
@ -849,7 +849,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_2901E2:: @ 82901E2
msgbox MauvilleCity_PokemonCenter_1F_Text_28E7EE, 5 msgbox MauvilleCity_PokemonCenter_1F_Text_28E7EE, 5
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219
specialvar VAR_RESULT, Special_StorytellerInitializeRandomStat specialvar VAR_RESULT, ScrSpecial_StorytellerInitializeRandomStat
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29020F goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29020F
msgbox MauvilleCity_PokemonCenter_1F_Text_28E881, 4 msgbox MauvilleCity_PokemonCenter_1F_Text_28E881, 4
@ -903,7 +903,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_2902F6:: @ 82902F6
end end
MauvilleCity_PokemonCenter_1F_EventScript_290317:: @ 8290317 MauvilleCity_PokemonCenter_1F_EventScript_290317:: @ 8290317
special Special_GiddyShouldTellAnotherTale special ScrSpecial_GiddyShouldTellAnotherTale
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290359 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290359
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@ -911,7 +911,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_290317:: @ 8290317
end end
MauvilleCity_PokemonCenter_1F_EventScript_290331:: @ 8290331 MauvilleCity_PokemonCenter_1F_EventScript_290331:: @ 8290331
special Special_GiddyShouldTellAnotherTale special ScrSpecial_GiddyShouldTellAnotherTale
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29034B goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29034B
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@ -924,7 +924,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_29034B:: @ 829034B
end end
MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359 MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359
special Special_GenerateGiddyLine special ScrSpecial_GenerateGiddyLine
special ShowFieldMessageStringVar4 special ShowFieldMessageStringVar4
waitmessage waitmessage
yesnobox 20, 8 yesnobox 20, 8

46
data/specials.inc
View File

@ -108,28 +108,28 @@ gSpecials:: @ 81DBA64
def_special sub_80FAFF8 def_special sub_80FAFF8
def_special easy_chat_input_maybe def_special easy_chat_input_maybe
def_special sub_811EECC def_special sub_811EECC
def_special Special_GetCurrentMauvilleMan def_special ScrSpecial_GetCurrentMauvilleMan
def_special Special_HasBardSongBeenChanged def_special ScrSpecial_HasBardSongBeenChanged
def_special Special_SaveBardSongLyrics def_special ScrSpecial_SaveBardSongLyrics
def_special Special_GetHipsterSpokenFlag def_special ScrSpecial_GetHipsterSpokenFlag
def_special Special_SetHipsterSpokenFlag def_special ScrSpecial_SetHipsterSpokenFlag
def_special Special_HipsterTeachWord def_special ScrSpecial_HipsterTeachWord
def_special Special_PlayBardSong def_special ScrSpecial_PlayBardSong
def_special Special_SetMauvilleOldManEventObjGfx def_special ScrSpecial_SetMauvilleOldManEventObjGfx
def_special Special_GenerateGiddyLine def_special ScrSpecial_GenerateGiddyLine
def_special Special_GiddyShouldTellAnotherTale def_special ScrSpecial_GiddyShouldTellAnotherTale
def_special Special_StorytellerGetFreeStorySlot def_special ScrSpecial_StorytellerGetFreeStorySlot
def_special Special_StorytellerDisplayStory def_special ScrSpecial_StorytellerDisplayStory
def_special Special_StorytellerStoryListMenu def_special ScrSpecial_StorytellerStoryListMenu
def_special Special_StorytellerUpdateStat def_special ScrSpecial_StorytellerUpdateStat
def_special Special_StorytellerInitializeRandomStat def_special ScrSpecial_StorytellerInitializeRandomStat
def_special Special_HasStorytellerAlreadyRecorded def_special ScrSpecial_HasStorytellerAlreadyRecorded
def_special Special_TraderMenuGetDecoration def_special ScrSpecial_TraderMenuGetDecoration
def_special Special_GetTraderTradedFlag def_special ScrSpecial_GetTraderTradedFlag
def_special Special_DoesPlayerHaveNoDecorations def_special ScrSpecial_DoesPlayerHaveNoDecorations
def_special Special_IsDecorationFull def_special ScrSpecial_IsDecorationFull
def_special Special_TraderMenuGiveDecoration def_special ScrSpecial_TraderMenuGiveDecoration
def_special Special_TraderDoDecorationTrade def_special ScrSpecial_TraderDoDecorationTrade
def_special GetSeedotSizeRecordInfo def_special GetSeedotSizeRecordInfo
def_special CompareSeedotSize def_special CompareSeedotSize
def_special GetLotadSizeRecordInfo def_special GetLotadSizeRecordInfo
@ -273,7 +273,7 @@ gSpecials:: @ 81DBA64
def_special ShowBerryBlenderRecordWindow def_special ShowBerryBlenderRecordWindow
def_special ResetTrickHouseEndRoomFlag def_special ResetTrickHouseEndRoomFlag
def_special SetTrickHouseEndRoomFlag def_special SetTrickHouseEndRoomFlag
def_special Special_CreatePCMenu def_special ScrSpecial_CreatePCMenu
def_special AccessHallOfFamePC def_special AccessHallOfFamePC
def_special Special_ShowDiploma def_special Special_ShowDiploma
def_special CheckLeadMonCool def_special CheckLeadMonCool

2
include/mauville_old_man.h
View File

@ -15,7 +15,7 @@ extern struct BardSong gBardSong;
void SetMauvilleOldMan(void); void SetMauvilleOldMan(void);
u8 GetCurrentMauvilleOldMan(void); u8 GetCurrentMauvilleOldMan(void);
void Special_SetMauvilleOldManEventObjGfx(void); void ScrSpecial_SetMauvilleOldManEventObjGfx(void);
u8 sub_81201C8(void); u8 sub_81201C8(void);
void sub_8120B70(OldMan *dest); void sub_8120B70(OldMan *dest);
void sub_8120670(void); void sub_8120670(void);

2
include/wild_encounter.h
View File

@ -33,7 +33,7 @@ extern const struct WildPokemonHeader gWildMonHeaders[];
void DisableWildEncounters(bool8 disabled); void DisableWildEncounters(bool8 disabled);
bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavior); bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavior);
void Special_RockSmashWildEncounter(void); void ScrSpecial_RockSmashWildEncounter(void);
bool8 SweetScentWildEncounter(void); bool8 SweetScentWildEncounter(void);
bool8 DoesCurrentMapHaveFishingMons(void); bool8 DoesCurrentMapHaveFishingMons(void);
void FishingWildEncounter(u8 rod); void FishingWildEncounter(u8 rod);

4
src/hof_pc.c
View File

@ -10,7 +10,7 @@
extern void (*gUnknown_0300485C)(void); extern void (*gUnknown_0300485C)(void);
extern void Overworld_PlaySpecialMapMusic(void); extern void Overworld_PlaySpecialMapMusic(void);
extern bool16 Special_CreatePCMenu(void); extern bool16 ScrSpecial_CreatePCMenu(void);
extern void ScriptMenu_DisplayPCStartupPrompt(void); extern void ScriptMenu_DisplayPCStartupPrompt(void);
static void ReshowPCMenuAfterHallOfFamePC(void); static void ReshowPCMenuAfterHallOfFamePC(void);
@ -32,7 +32,7 @@ static void ReshowPCMenuAfterHallOfFamePC(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
Overworld_PlaySpecialMapMusic(); Overworld_PlaySpecialMapMusic();
Special_CreatePCMenu(); ScrSpecial_CreatePCMenu();
ScriptMenu_DisplayPCStartupPrompt(); ScriptMenu_DisplayPCStartupPrompt();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
CreateTask(Task_WaitForPaletteFade, 10); CreateTask(Task_WaitForPaletteFade, 10);

36
src/mauville_old_man.c
View File

@ -136,7 +136,7 @@ void SetMauvilleOldMan(void)
SetupGiddy(); SetupGiddy();
break; break;
} }
Special_SetMauvilleOldManEventObjGfx(); ScrSpecial_SetMauvilleOldManEventObjGfx();
} }
u8 GetCurrentMauvilleOldMan(void) u8 GetCurrentMauvilleOldMan(void)
@ -146,12 +146,12 @@ u8 GetCurrentMauvilleOldMan(void)
return common->id; return common->id;
} }
void Special_GetCurrentMauvilleMan(void) void ScrSpecial_GetCurrentMauvilleMan(void)
{ {
gSpecialVar_Result = GetCurrentMauvilleOldMan(); gSpecialVar_Result = GetCurrentMauvilleOldMan();
} }
void Special_HasBardSongBeenChanged(void) void ScrSpecial_HasBardSongBeenChanged(void)
{ {
u16 *scriptResult = &gSpecialVar_Result; // why?? u16 *scriptResult = &gSpecialVar_Result; // why??
struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard; struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard;
@ -159,7 +159,7 @@ void Special_HasBardSongBeenChanged(void)
*scriptResult = bard->hasChangedSong; *scriptResult = bard->hasChangedSong;
} }
void Special_SaveBardSongLyrics(void) void ScrSpecial_SaveBardSongLyrics(void)
{ {
u16 i; u16 i;
struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard; struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard;
@ -225,13 +225,13 @@ static void PrepareSongText(void)
} }
} }
void Special_PlayBardSong(void) void ScrSpecial_PlayBardSong(void)
{ {
StartBardSong(gSpecialVar_0x8004); StartBardSong(gSpecialVar_0x8004);
ScriptContext1_Stop(); ScriptContext1_Stop();
} }
void Special_GetHipsterSpokenFlag(void) void ScrSpecial_GetHipsterSpokenFlag(void)
{ {
u16 *scriptResult = &gSpecialVar_Result; // again?? u16 *scriptResult = &gSpecialVar_Result; // again??
struct MauvilleManHipster *hipster = &gSaveBlock1Ptr->oldMan.hipster; struct MauvilleManHipster *hipster = &gSaveBlock1Ptr->oldMan.hipster;
@ -239,14 +239,14 @@ void Special_GetHipsterSpokenFlag(void)
*scriptResult = hipster->alreadySpoken; *scriptResult = hipster->alreadySpoken;
} }
void Special_SetHipsterSpokenFlag(void) void ScrSpecial_SetHipsterSpokenFlag(void)
{ {
struct MauvilleManHipster *hipster = &gSaveBlock1Ptr->oldMan.hipster; struct MauvilleManHipster *hipster = &gSaveBlock1Ptr->oldMan.hipster;
hipster->alreadySpoken = TRUE; hipster->alreadySpoken = TRUE;
} }
void Special_HipsterTeachWord(void) void ScrSpecial_HipsterTeachWord(void)
{ {
u16 var = sub_811F01C(); u16 var = sub_811F01C();
@ -261,7 +261,7 @@ void Special_HipsterTeachWord(void)
} }
} }
void Special_GiddyShouldTellAnotherTale(void) void ScrSpecial_GiddyShouldTellAnotherTale(void)
{ {
struct MauvilleManGiddy *giddy = &gSaveBlock1Ptr->oldMan.giddy; struct MauvilleManGiddy *giddy = &gSaveBlock1Ptr->oldMan.giddy;
@ -276,7 +276,7 @@ void Special_GiddyShouldTellAnotherTale(void)
} }
} }
void Special_GenerateGiddyLine(void) void ScrSpecial_GenerateGiddyLine(void)
{ {
struct MauvilleManGiddy *giddy = &gSaveBlock1Ptr->oldMan.giddy; struct MauvilleManGiddy *giddy = &gSaveBlock1Ptr->oldMan.giddy;
@ -406,7 +406,7 @@ void ResetMauvilleOldManFlag(void)
case MAUVILLE_MAN_GIDDY: case MAUVILLE_MAN_GIDDY:
break; break;
} }
Special_SetMauvilleOldManEventObjGfx(); ScrSpecial_SetMauvilleOldManEventObjGfx();
} }
@ -671,7 +671,7 @@ static void Task_BardSong(u8 taskId)
sub_8197224(); sub_8197224();
} }
void Special_SetMauvilleOldManEventObjGfx(void) void ScrSpecial_SetMauvilleOldManEventObjGfx(void)
{ {
VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BARD); 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 // Sets gSpecialVar_Result to TRUE if player selected a story
void Special_StorytellerStoryListMenu(void) void ScrSpecial_StorytellerStoryListMenu(void)
{ {
CreateTask(Task_StoryListMenu, 80); CreateTask(Task_StoryListMenu, 80);
} }
void Special_StorytellerDisplayStory(void) void ScrSpecial_StorytellerDisplayStory(void)
{ {
StorytellerDisplayStory(sSelectedStory); StorytellerDisplayStory(sSelectedStory);
} }
u8 Special_StorytellerGetFreeStorySlot(void) u8 ScrSpecial_StorytellerGetFreeStorySlot(void)
{ {
sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller; sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller;
return GetFreeStorySlot(); return GetFreeStorySlot();
} }
// Returns TRUE if stat has increased // Returns TRUE if stat has increased
bool8 Special_StorytellerUpdateStat(void) bool8 ScrSpecial_StorytellerUpdateStat(void)
{ {
u8 r4; u8 r4;
sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller; sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller;
@ -1230,7 +1230,7 @@ bool8 Special_StorytellerUpdateStat(void)
return FALSE; return FALSE;
} }
bool8 Special_HasStorytellerAlreadyRecorded(void) bool8 ScrSpecial_HasStorytellerAlreadyRecorded(void)
{ {
sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller; sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller;
@ -1240,7 +1240,7 @@ bool8 Special_HasStorytellerAlreadyRecorded(void)
return TRUE; return TRUE;
} }
bool8 Special_StorytellerInitializeRandomStat(void) bool8 ScrSpecial_StorytellerInitializeRandomStat(void)
{ {
sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller; sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller;
return StorytellerInitializeRandomStat(); return StorytellerInitializeRandomStat();

12
src/trader.c
View File

@ -130,13 +130,13 @@ void Task_HandleGetDecorationMenuInput(u8 taskId)
} }
} }
void Special_GetTraderTradedFlag(void) void ScrSpecial_GetTraderTradedFlag(void)
{ {
struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader; struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader;
gSpecialVar_Result = trader->alreadyTraded; gSpecialVar_Result = trader->alreadyTraded;
} }
void Special_DoesPlayerHaveNoDecorations(void) void ScrSpecial_DoesPlayerHaveNoDecorations(void)
{ {
u8 i; u8 i;
@ -151,7 +151,7 @@ void Special_DoesPlayerHaveNoDecorations(void)
gSpecialVar_Result = TRUE; gSpecialVar_Result = TRUE;
} }
void Special_IsDecorationFull(void) void ScrSpecial_IsDecorationFull(void)
{ {
gSpecialVar_Result = FALSE; gSpecialVar_Result = FALSE;
if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category
@ -162,7 +162,7 @@ void Special_IsDecorationFull(void)
} }
} }
void Special_TraderMenuGiveDecoration(void) void ScrSpecial_TraderMenuGiveDecoration(void)
{ {
CreateTask(sub_8127208, 0); CreateTask(sub_8127208, 0);
} }
@ -190,7 +190,7 @@ void sub_8133E1C(u8 taskId)
EnableBothScriptContexts(); EnableBothScriptContexts();
} }
void Special_TraderDoDecorationTrade(void) void ScrSpecial_TraderDoDecorationTrade(void)
{ {
struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader; struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader;
@ -202,7 +202,7 @@ void Special_TraderDoDecorationTrade(void)
trader->alreadyTraded = TRUE; trader->alreadyTraded = TRUE;
} }
void Special_TraderMenuGetDecoration(void) void ScrSpecial_TraderMenuGetDecoration(void)
{ {
u8 taskId = CreateTask(Task_HandleGetDecorationMenuInput, 0); u8 taskId = CreateTask(Task_HandleGetDecorationMenuInput, 0);
CreateAvailableDecorationsMenu(taskId); CreateAvailableDecorationsMenu(taskId);