Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-04-26 16:27:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sync Script and Mystery Event files with pokeemerald (#890)
Some checks failed
CI / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Eduardo Quezada 2026-02-21 21:09:13 -03:00 committed by GitHub
parent f6e2a5901e
commit 71203c45b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
76 changed files with 658 additions and 626 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/easy_chat.h
View File

@ -129,7 +129,7 @@ u8* EasyChat_GetWordText(u8 *, u16);
u8 *ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16, u16); u8 *ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16, u16);
u16 sub_80EB784(u16 group); u16 sub_80EB784(u16 group);
u8 sub_80EB868(u8); u8 sub_80EB868(u8);
void sub_80EB890(u8); void UnlockTrendySaying(u8);
u8 sub_80EB8C0(void); u8 sub_80EB8C0(void);
u16 sub_80EB8EC(void); u16 sub_80EB8EC(void);
u8 *sub_80EB544(u8 *dst, u16 *words, u16 arg2, u16 arg3); u8 *sub_80EB544(u8 *dst, u16 *words, u16 arg2, u16 arg3);

2
include/global.h
View File

@ -220,7 +220,7 @@ struct RamScriptData
u8 magic; u8 magic;
u8 mapGroup; u8 mapGroup;
u8 mapNum; u8 mapNum;
u8 objectId; u8 localId;
u8 script[995]; u8 script[995];
}; };

22
include/mystery_event_msg.h
View File

@ -1,16 +1,16 @@
#ifndef GUARD_MYSTERY_EVENT_MSG_H #ifndef GUARD_MYSTERY_EVENT_MSG_H
#define GUARD_MYSTERY_EVENT_MSG_H #define GUARD_MYSTERY_EVENT_MSG_H
extern const u8 gOtherText_BerryObtainedDadHasIt[]; extern const u8 gText_MysteryEventBerry[];
extern const u8 gOtherText_BerryTransformed[]; extern const u8 gText_MysteryEventBerryTransform[];
extern const u8 gOtherText_BerryAlreadyObtained[]; extern const u8 gText_MysteryEventBerryObtained[];
extern const u8 gOtherText_SpecialRibbonReceived[]; extern const u8 gText_MysteryEventSpecialRibbon[];
extern const u8 gOtherText_DexUpgraded[]; extern const u8 gText_MysteryEventNationalDex[];
extern const u8 gOtherText_RareWordAdded[]; extern const u8 gText_MysteryEventRareWord[];
extern const u8 gOtherText_PokeWasSentOver[]; extern const u8 gText_MysteryEventSentOver[];
extern const u8 gOtherText_PartyIsFull[]; extern const u8 gText_MysteryEventFullParty[];
extern const u8 gOtherText_NewTrainerInHoenn[]; extern const u8 gText_MysteryEventNewTrainer[];
extern const u8 gOtherText_NewAdversaryInBattleTower[]; extern const u8 gText_MysteryEventNewAdversaryInBattleTower[];
extern const u8 gOtherText_DataCannotUseVersion[]; extern const u8 gText_MysteryEventCantBeUsed[];
#endif //GUARD_MYSTERY_EVENT_MSG_H #endif //GUARD_MYSTERY_EVENT_MSG_H

12
include/mystery_event_script.h
View File

@ -1,8 +1,16 @@
#ifndef GUARD_MYSTERY_EVENT_SCRIPT_H #ifndef GUARD_MYSTERY_EVENT_SCRIPT_H
#define GUARD_MYSTERY_EVENT_SCRIPT_H #define GUARD_MYSTERY_EVENT_SCRIPT_H
u32 RunMysteryEventScript(u8 *); enum {
void SetMysteryEventScriptStatus(u32 val); MEVENT_STATUS_LOAD_OK,
MEVENT_STATUS_LOAD_ERROR,
MEVENT_STATUS_SUCCESS,
MEVENT_STATUS_FAILURE,
MEVENT_STATUS_FF = 0xFF
};
u32 RunMysteryEventScript(u8 *script);
void SetMysteryEventScriptStatus(u32 status);
u16 GetRecordMixingGift(void); u16 GetRecordMixingGift(void);
#if DEBUG #if DEBUG
bool8 debug_sub_812620C(u8 *a1, const u8 * _a2); bool8 debug_sub_812620C(u8 *a1, const u8 * _a2);

2
include/pokemon_storage_system.h
View File

@ -300,7 +300,7 @@ void sub_809BB90(void);
void sub_809BBC0(void); void sub_809BBC0(void);
void sub_809BC18(void); void sub_809BC18(void);
void sub_809BD14(void); void sub_809BD14(void);
s16 party_compaction(void); s16 CompactPartySlots(void);
void sub_809BDD8(u8 markings); void sub_809BDD8(u8 markings);
bool8 sub_809BE80(void); bool8 sub_809BE80(void);
bool8 sub_809BEBC(void); bool8 sub_809BEBC(void);

30
include/script.h
View File

@ -25,23 +25,21 @@ void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTable
u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr); u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr);
void SetupNativeScript(struct ScriptContext *ctx, bool8 (*ptr)(void)); void SetupNativeScript(struct ScriptContext *ctx, bool8 (*ptr)(void));
void StopScript(struct ScriptContext *ctx); void StopScript(struct ScriptContext *ctx);
u8 RunScriptCommand(struct ScriptContext *ctx); bool8 RunScriptCommand(struct ScriptContext *ctx);
u8 ScriptPush(struct ScriptContext *ctx, const u8 *ptr); void ScriptJump(struct ScriptContext *ctx, const u8 *ptr);
const u8 *ScriptPop(struct ScriptContext *ctx); void ScriptCall(struct ScriptContext *ctx, const u8 *ptr);
void ScriptJump(struct ScriptContext *ctx, u8 *ptr);
void ScriptCall(struct ScriptContext *ctx, u8 *ptr);
void ScriptReturn(struct ScriptContext *ctx); void ScriptReturn(struct ScriptContext *ctx);
u16 ScriptReadHalfword(struct ScriptContext *ctx); u16 ScriptReadHalfword(struct ScriptContext *ctx);
u32 ScriptReadWord(struct ScriptContext *ctx); u32 ScriptReadWord(struct ScriptContext *ctx);
void ScriptContext2_Enable(void); void LockPlayerFieldControls(void);
void ScriptContext2_Disable(void); void UnlockPlayerFieldControls(void);
bool8 ScriptContext2_IsEnabled(void); bool8 ArePlayerFieldControlsLocked(void);
void ScriptContext1_Init(void); void ScriptContext_Init(void);
bool8 ScriptContext2_RunScript(void); bool8 ScriptContext_RunScript(void);
void ScriptContext1_SetupScript(const u8 *ptr); void ScriptContext_SetupScript(const u8 *ptr);
void ScriptContext1_Stop(void); void ScriptContext_Stop(void);
void EnableBothScriptContexts(void); void ScriptContext_Enable(void);
void ScriptContext2_RunNewScript(const u8 *ptr); void RunScriptImmediately(const u8 *ptr);
void RunOnLoadMapScript(void); void RunOnLoadMapScript(void);
void RunOnTransitionMapScript(void); void RunOnTransitionMapScript(void);
void RunOnResumeMapScript(void); void RunOnResumeMapScript(void);
@ -49,7 +47,7 @@ void RunOnDiveWarpMapScript(void);
bool8 TryRunOnFrameMapScript(void); bool8 TryRunOnFrameMapScript(void);
void TryRunOnWarpIntoMapScript(void); void TryRunOnWarpIntoMapScript(void);
void ClearRamScript(void); void ClearRamScript(void);
bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId); bool8 InitRamScript(const u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 localId);
const u8 *GetRamScript(u8 objectId, const u8 *script); const u8 *GetRamScript(u8 localId, const u8 *script);
#endif // GUARD_SCRIPT_H #endif // GUARD_SCRIPT_H

6
include/strings.h
View File

@ -17,8 +17,8 @@ extern const u8 gExpandedPlaceholder_Brendan[];
extern const u8 gExpandedPlaceholder_May[]; extern const u8 gExpandedPlaceholder_May[];
// system text // system text
extern const u8 gSystemText_Egg[]; extern const u8 gText_EggNickname[];
extern const u8 gSystemText_Pokemon2[]; extern const u8 gText_Pokemon[];
// main menu text // main menu text
extern const u8 gMainMenuString_NewGame[]; extern const u8 gMainMenuString_NewGame[];
@ -902,7 +902,7 @@ extern const u8 gSystemText_ClockResetDataSave[];
extern const u8 gSystemText_SaveCompleted[]; extern const u8 gSystemText_SaveCompleted[];
extern const u8 gSystemText_SaveFailed[]; extern const u8 gSystemText_SaveFailed[];
extern const u8 gSystemText_NoSaveFileNoTime[]; extern const u8 gSystemText_NoSaveFileNoTime[];
extern const u8 gSystemText_ClockAdjustmentUsable[]; extern const u8 gText_InGameClockUsable[];
extern const u8 gSystemText_Saving[]; extern const u8 gSystemText_Saving[];
#endif #endif

26
src/battle_setup.c
View File

@ -517,7 +517,7 @@ void BattleSetup_StartWildBattle(void)
static void DoStandardWildBattle(void) static void DoStandardWildBattle(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
FreezeObjectEvents(); FreezeObjectEvents();
sub_80597F4(); sub_80597F4();
gMain.savedCallback = CB2_EndWildBattle; gMain.savedCallback = CB2_EndWildBattle;
@ -529,7 +529,7 @@ static void DoStandardWildBattle(void)
void BattleSetup_StartRoamerBattle(void) void BattleSetup_StartRoamerBattle(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
FreezeObjectEvents(); FreezeObjectEvents();
sub_80597F4(); sub_80597F4();
gMain.savedCallback = CB2_EndWildBattle; gMain.savedCallback = CB2_EndWildBattle;
@ -541,7 +541,7 @@ void BattleSetup_StartRoamerBattle(void)
static void DoSafariBattle(void) static void DoSafariBattle(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
FreezeObjectEvents(); FreezeObjectEvents();
sub_80597F4(); sub_80597F4();
gMain.savedCallback = sub_80C824C; gMain.savedCallback = sub_80C824C;
@ -560,7 +560,7 @@ static void StartTheBattle(void)
void ScrSpecial_StartWallyTutorialBattle(void) void ScrSpecial_StartWallyTutorialBattle(void)
{ {
CreateMaleMon(&gEnemyParty[0], SPECIES_RALTS, 5); CreateMaleMon(&gEnemyParty[0], SPECIES_RALTS, 5);
ScriptContext2_Enable(); LockPlayerFieldControls();
gMain.savedCallback = CB2_ReturnToFieldContinueScriptPlayMapMusic; gMain.savedCallback = CB2_ReturnToFieldContinueScriptPlayMapMusic;
gBattleTypeFlags = BATTLE_TYPE_WALLY_TUTORIAL; gBattleTypeFlags = BATTLE_TYPE_WALLY_TUTORIAL;
CreateBattleStartTask(B_TRANSITION_SLICE, 0); CreateBattleStartTask(B_TRANSITION_SLICE, 0);
@ -568,7 +568,7 @@ void ScrSpecial_StartWallyTutorialBattle(void)
void BattleSetup_StartScriptedWildBattle(void) void BattleSetup_StartScriptedWildBattle(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
gMain.savedCallback = CB2_EndScriptedWildBattle; gMain.savedCallback = CB2_EndScriptedWildBattle;
gBattleTypeFlags = 0; gBattleTypeFlags = 0;
CreateBattleStartTask(GetWildBattleTransition(), 0); CreateBattleStartTask(GetWildBattleTransition(), 0);
@ -578,7 +578,7 @@ void BattleSetup_StartScriptedWildBattle(void)
void ScrSpecial_StartSouthernIslandBattle(void) void ScrSpecial_StartSouthernIslandBattle(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
gMain.savedCallback = CB2_EndScriptedWildBattle; gMain.savedCallback = CB2_EndScriptedWildBattle;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY; gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
CreateBattleStartTask(GetWildBattleTransition(), 0); CreateBattleStartTask(GetWildBattleTransition(), 0);
@ -588,7 +588,7 @@ void ScrSpecial_StartSouthernIslandBattle(void)
void ScrSpecial_StartRayquazaBattle(void) void ScrSpecial_StartRayquazaBattle(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
gMain.savedCallback = CB2_EndScriptedWildBattle; gMain.savedCallback = CB2_EndScriptedWildBattle;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY; gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_KYOGRE_GROUDON); CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_KYOGRE_GROUDON);
@ -598,7 +598,7 @@ void ScrSpecial_StartRayquazaBattle(void)
void ScrSpecial_StartGroudonKyogreBattle(void) void ScrSpecial_StartGroudonKyogreBattle(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
gMain.savedCallback = CB2_EndScriptedWildBattle; gMain.savedCallback = CB2_EndScriptedWildBattle;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON; gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON;
if (gGameVersion == VERSION_RUBY) if (gGameVersion == VERSION_RUBY)
@ -611,7 +611,7 @@ void ScrSpecial_StartGroudonKyogreBattle(void)
void ScrSpecial_StartRegiBattle(void) void ScrSpecial_StartRegiBattle(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
gMain.savedCallback = CB2_EndScriptedWildBattle; gMain.savedCallback = CB2_EndScriptedWildBattle;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI; gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI;
CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, MUS_VS_REGI); CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, MUS_VS_REGI);
@ -1046,8 +1046,8 @@ void TrainerWantsBattle(u8 trainerObjEventId, const u8 *trainerScript)
gSelectedObjectEvent = trainerObjEventId; gSelectedObjectEvent = trainerObjEventId;
gSpecialVar_LastTalked = gObjectEvents[trainerObjEventId].localId; gSpecialVar_LastTalked = gObjectEvents[trainerObjEventId].localId;
BattleSetup_ConfigureTrainerBattle(trainerScript + 1); BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
ScriptContext1_SetupScript(EventScript_StartTrainerBattle); ScriptContext_SetupScript(EventScript_StartTrainerBattle);
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
bool32 GetTrainerFlagFromScriptPointer(const u8 *data) bool32 GetTrainerFlagFromScriptPointer(const u8 *data)
@ -1103,7 +1103,7 @@ void BattleSetup_StartTrainerBattle(void)
gBattleTypeFlags = BATTLE_TYPE_TRAINER; gBattleTypeFlags = BATTLE_TYPE_TRAINER;
gMain.savedCallback = CB2_EndTrainerBattle; gMain.savedCallback = CB2_EndTrainerBattle;
StartTheBattle(); StartTheBattle();
ScriptContext1_Stop(); ScriptContext_Stop();
} }
void CB2_EndTrainerBattle(void) void CB2_EndTrainerBattle(void)
@ -1146,7 +1146,7 @@ void BattleSetup_StartRematchBattle(void)
gBattleTypeFlags = BATTLE_TYPE_TRAINER; gBattleTypeFlags = BATTLE_TYPE_TRAINER;
gMain.savedCallback = CB2_EndTrainerEyeRematchBattle; gMain.savedCallback = CB2_EndTrainerEyeRematchBattle;
StartTheBattle(); StartTheBattle();
ScriptContext1_Stop(); ScriptContext_Stop();
} }
static const u8 *GetTrainerIntroSpeech(void); static const u8 *GetTrainerIntroSpeech(void);

12
src/braille_puzzles.c
View File

@ -52,7 +52,7 @@ void DoBrailleDigEffect(void)
DrawWholeMapView(); DrawWholeMapView();
PlaySE(SE_BANG); PlaySE(SE_BANG);
FlagSet(FLAG_SYS_BRAILLE_DIG); FlagSet(FLAG_SYS_BRAILLE_DIG);
ScriptContext2_Disable(); UnlockPlayerFieldControls();
} }
bool8 CheckRelicanthWailord(void) bool8 CheckRelicanthWailord(void)
@ -95,7 +95,7 @@ void DoBrailleStrengthEffect(void)
DrawWholeMapView(); DrawWholeMapView();
PlaySE(SE_BANG); PlaySE(SE_BANG);
FlagSet(FLAG_SYS_BRAILLE_STRENGTH); FlagSet(FLAG_SYS_BRAILLE_STRENGTH);
ScriptContext2_Disable(); UnlockPlayerFieldControls();
} }
bool8 ShouldDoBrailleFlyEffect(void) bool8 ShouldDoBrailleFlyEffect(void)
@ -141,7 +141,7 @@ void UseFlyAncientTomb_Finish(void)
DrawWholeMapView(); DrawWholeMapView();
PlaySE(SE_BANG); PlaySE(SE_BANG);
FlagSet(FLAG_SYS_BRAILLE_FLY); FlagSet(FLAG_SYS_BRAILLE_FLY);
ScriptContext2_Disable(); UnlockPlayerFieldControls();
} }
void DoBrailleWait(void) void DoBrailleWait(void)
@ -188,7 +188,7 @@ void Task_BrailleWait(u8 taskId)
} }
ScriptUnfreezeObjectEvents(); ScriptUnfreezeObjectEvents();
DestroyTask(taskId); DestroyTask(taskId);
ScriptContext2_Disable(); UnlockPlayerFieldControls();
break; break;
case 3: case 3:
data[1] = data[1] - 1; data[1] = data[1] - 1;
@ -197,7 +197,7 @@ void Task_BrailleWait(u8 taskId)
break; break;
case 4: case 4:
ScriptUnfreezeObjectEvents(); ScriptUnfreezeObjectEvents();
ScriptContext1_SetupScript(S_OpenRegiceChamber); ScriptContext_SetupScript(S_OpenRegiceChamber);
DestroyTask(taskId); DestroyTask(taskId);
break; break;
} }
@ -257,7 +257,7 @@ void SealedChamberShakingEffect(u8 taskId)
if (task->data[2] == task->data[6]) if (task->data[2] == task->data[6])
{ {
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); ScriptContext_Enable();
InstallCameraPanAheadCallback(); InstallCameraPanAheadCallback();
} }
} }

6
src/cable_car.c
View File

@ -215,7 +215,7 @@ extern const u8 MauvilleCity_GameCorner_EventScript_1C40AC[];
u8 debug_sub_8138C14(void) u8 debug_sub_8138C14(void)
{ {
unk_203955C = 1; unk_203955C = 1;
ScriptContext1_SetupScript(MauvilleCity_GameCorner_EventScript_1C407E); ScriptContext_SetupScript(MauvilleCity_GameCorner_EventScript_1C407E);
CloseMenu(); CloseMenu();
return 1; return 1;
} }
@ -223,7 +223,7 @@ u8 debug_sub_8138C14(void)
u8 debug_sub_8138C34(void) u8 debug_sub_8138C34(void)
{ {
unk_203955C = 1; unk_203955C = 1;
ScriptContext1_SetupScript(MauvilleCity_GameCorner_EventScript_1C40AC); ScriptContext_SetupScript(MauvilleCity_GameCorner_EventScript_1C40AC);
CloseMenu(); CloseMenu();
return 1; return 1;
} }
@ -273,7 +273,7 @@ static void CableCarTask1(u8 taskId)
void CableCar(void) void CableCar(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
CreateTask(CableCarTask1, 1); CreateTask(CableCarTask1, 1);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
} }

24
src/cable_club.c
View File

@ -506,7 +506,7 @@ static void sub_8083314(u8 taskId)
} }
sub_8082D4C(); sub_8082D4C();
#endif #endif
EnableBothScriptContexts(); ScriptContext_Enable();
DestroyTask(taskId); DestroyTask(taskId);
return; return;
} }
@ -520,7 +520,7 @@ static void sub_80833C4(u8 taskId)
if (gReceivedRemoteLinkPlayers == FALSE) if (gReceivedRemoteLinkPlayers == FALSE)
{ {
sub_8082D4C(); sub_8082D4C();
EnableBothScriptContexts(); ScriptContext_Enable();
DestroyTask(taskId); DestroyTask(taskId);
} }
} }
@ -530,7 +530,7 @@ static void sub_80833EC(u8 taskId)
gSpecialVar_Result = 5; gSpecialVar_Result = 5;
sub_8082D4C(); sub_8082D4C();
HideFieldMessageBox(); HideFieldMessageBox();
EnableBothScriptContexts(); ScriptContext_Enable();
DestroyTask(taskId); DestroyTask(taskId);
} }
@ -539,7 +539,7 @@ static void sub_8083418(u8 taskId)
gSpecialVar_Result = 6; gSpecialVar_Result = 6;
sub_8082D4C(); sub_8082D4C();
HideFieldMessageBox(); HideFieldMessageBox();
EnableBothScriptContexts(); ScriptContext_Enable();
DestroyTask(taskId); DestroyTask(taskId);
} }
@ -617,13 +617,13 @@ static void sub_808353C(u8 taskId)
} }
} }
} }
EnableBothScriptContexts(); ScriptContext_Enable();
DestroyTask(taskId); DestroyTask(taskId);
break; break;
case 1: case 1:
if (gReceivedRemoteLinkPlayers == FALSE) if (gReceivedRemoteLinkPlayers == FALSE)
{ {
EnableBothScriptContexts(); ScriptContext_Enable();
DestroyTask(taskId); DestroyTask(taskId);
} }
break; break;
@ -858,7 +858,7 @@ static void sub_80839DC(u8 taskId)
HideFieldMessageBox(); HideFieldMessageBox();
Menu_EraseScreen(); Menu_EraseScreen();
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); ScriptContext_Enable();
break; break;
} }
} }
@ -867,7 +867,7 @@ void sub_8083A84(TaskFunc followupFunc)
{ {
u8 taskId = CreateTask(sub_80839DC, 80); u8 taskId = CreateTask(sub_80839DC, 80);
SetTaskFuncWithFollowupFunc(taskId, sub_80839DC, followupFunc); SetTaskFuncWithFollowupFunc(taskId, sub_80839DC, followupFunc);
ScriptContext1_Stop(); ScriptContext_Stop();
} }
static void sub_8083AAC(u8 taskId) static void sub_8083AAC(u8 taskId)
@ -877,7 +877,7 @@ static void sub_8083AAC(u8 taskId)
switch (task->data[0]) switch (task->data[0])
{ {
case 0: case 0:
ScriptContext2_Enable(); LockPlayerFieldControls();
FadeScreen(1, 0); FadeScreen(1, 0);
ClearLinkCallback_2(); ClearLinkCallback_2();
task->data[0]++; task->data[0]++;
@ -922,7 +922,7 @@ static void sub_8083B6C(void)
void sub_8083B80(void) void sub_8083B80(void)
{ {
sub_8083B6C(); sub_8083B6C();
ScriptContext1_Stop(); ScriptContext_Stop();
} }
void sub_8083B90(void) void sub_8083B90(void)
@ -935,7 +935,7 @@ void unref_sub_8083BB0(void)
{ {
u8 taskId = CreateTask(sub_80839DC, 80); u8 taskId = CreateTask(sub_80839DC, 80);
SetTaskFuncWithFollowupFunc(taskId, sub_80839DC, Task_RecordMixing_Main); SetTaskFuncWithFollowupFunc(taskId, sub_80839DC, Task_RecordMixing_Main);
ScriptContext1_Stop(); ScriptContext_Stop();
} }
void sub_8083BDC(void) void sub_8083BDC(void)
@ -1002,7 +1002,7 @@ static void sub_8083CA4(u8 taskId)
{ {
if (!gReceivedRemoteLinkPlayers) if (!gReceivedRemoteLinkPlayers)
{ {
EnableBothScriptContexts(); ScriptContext_Enable();
DestroyTask(taskId); DestroyTask(taskId);
} }
} }

4
src/choose_party.c
View File

@ -965,7 +965,7 @@ static void sub_81231C4(u8 taskId)
if (IsWeatherNotFadingIn() == TRUE) if (IsWeatherNotFadingIn() == TRUE)
{ {
DestroyTask(taskId); DestroyTask(taskId);
ScriptContext2_Disable(); UnlockPlayerFieldControls();
EnableBothScriptContexts(); ScriptContext_Enable();
} }
} }

4
src/contest.c
View File

@ -1882,8 +1882,8 @@ void Task_ContestReturnToField(u8 taskId)
void FieldCB_ContestReturnToField(void) void FieldCB_ContestReturnToField(void)
{ {
// Why disable and re-enable again? // Why disable and re-enable again?
ScriptContext2_Disable(); UnlockPlayerFieldControls();
EnableBothScriptContexts(); ScriptContext_Enable();
} }
// Expands a one-digit number in the string // Expands a one-digit number in the string

14
src/contest_link_util.c
View File

@ -2765,7 +2765,7 @@ void sub_80C489C(u8 taskId)
void sub_80C48C8(void) void sub_80C48C8(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
CreateTask(sub_80C489C, 10); CreateTask(sub_80C489C, 10);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
} }
@ -2786,7 +2786,7 @@ void sub_80C4914(u8 taskId)
void sub_80C4940(void) void sub_80C4940(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
CreateTask(sub_80C4914, 10); CreateTask(sub_80C4914, 10);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
} }
@ -2799,7 +2799,7 @@ void ScrSpecial_GetContestPlayerMonIdx(void)
void ContestLinkTransfer(u8 category) void ContestLinkTransfer(u8 category)
{ {
u8 taskId; u8 taskId;
ScriptContext2_Enable(); LockPlayerFieldControls();
taskId = CreateTask(Task_LinkContest_Init, 0); taskId = CreateTask(Task_LinkContest_Init, 0);
SetTaskFuncWithFollowupFunc(taskId, Task_LinkContest_Init, Task_StartCommunication); SetTaskFuncWithFollowupFunc(taskId, Task_LinkContest_Init, Task_StartCommunication);
gTasks[taskId].data[9] = category; gTasks[taskId].data[9] = category;
@ -2889,8 +2889,8 @@ void Task_LinkContest_FinalizeConnection(u8 taskId)
else else
{ {
DestroyTask(taskId); DestroyTask(taskId);
ScriptContext2_Disable(); UnlockPlayerFieldControls();
EnableBothScriptContexts(); ScriptContext_Enable();
} }
} }
@ -2905,7 +2905,7 @@ void Task_LinkContest_WaitDisconnect(u8 taskId)
if (!gReceivedRemoteLinkPlayers) if (!gReceivedRemoteLinkPlayers)
{ {
DestroyTask(taskId); DestroyTask(taskId);
ScriptContext2_Disable(); UnlockPlayerFieldControls();
EnableBothScriptContexts(); ScriptContext_Enable();
} }
} }

10
src/daycare.c
View File

@ -139,7 +139,7 @@ static void StorePokemonInDaycare(struct Pokemon * mon, struct DayCare * daycare
BoxMonRestorePP(&daycare->mons[emptySlot]); BoxMonRestorePP(&daycare->mons[emptySlot]);
daycare->misc.countersEtc.steps[emptySlot] = 0; daycare->misc.countersEtc.steps[emptySlot] = 0;
ZeroMonData(mon); ZeroMonData(mon);
party_compaction(); CompactPartySlots();
CalculatePlayerPartyCount(); CalculatePlayerPartyCount();
} }
@ -221,7 +221,7 @@ static u16 TakeSelectedPokemonFromDaycare(struct DayCare * daycare, u8 slot)
ClearDaycareMail(&daycare->misc.mail[slot]); ClearDaycareMail(&daycare->misc.mail[slot]);
} }
party_compaction(); CompactPartySlots();
ZeroBoxMonData(&daycare->mons[slot]); ZeroBoxMonData(&daycare->mons[slot]);
daycare->misc.countersEtc.steps[slot] = 0; daycare->misc.countersEtc.steps[slot] = 0;
ShiftDaycareSlots(daycare); ShiftDaycareSlots(daycare);
@ -678,7 +678,7 @@ static void _GiveEggFromDaycare(struct DayCare *daycare) // give_egg
isEgg = TRUE; isEgg = TRUE;
SetMonData(&egg, MON_DATA_IS_EGG, &isEgg); SetMonData(&egg, MON_DATA_IS_EGG, &isEgg);
gPlayerParty[5] = egg; gPlayerParty[5] = egg;
party_compaction(); CompactPartySlots();
CalculatePlayerPartyCount(); CalculatePlayerPartyCount();
RemoveEggFromDayCare(daycare); RemoveEggFromDayCare(daycare);
} }
@ -1044,7 +1044,7 @@ static void HandleDaycareLevelMenuInput(u8 taskId)
gLastFieldPokeMenuOpened = gSpecialVar_Result = gTasks[taskId].data[0]; gLastFieldPokeMenuOpened = gSpecialVar_Result = gTasks[taskId].data[0];
DestroyTask(taskId); DestroyTask(taskId);
Menu_EraseWindowRect(15, 6, 29, 13); Menu_EraseWindowRect(15, 6, 29, 13);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
else if (JOY_NEW(B_BUTTON)) else if (JOY_NEW(B_BUTTON))
{ {
@ -1052,7 +1052,7 @@ static void HandleDaycareLevelMenuInput(u8 taskId)
gLastFieldPokeMenuOpened = gSpecialVar_Result = 2; gLastFieldPokeMenuOpened = gSpecialVar_Result = 2;
DestroyTask(taskId); DestroyTask(taskId);
Menu_EraseWindowRect(15, 6, 29, 13); Menu_EraseWindowRect(15, 6, 29, 13);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
} }

6
src/debug/kagaya_debug_menu.c
View File

@ -85,7 +85,7 @@ u8 debug_sub_80B068C(void)
{ {
debug_sub_80A0710(c2_exit_to_overworld_1_sub_8080DEC); debug_sub_80A0710(c2_exit_to_overworld_1_sub_8080DEC);
CloseMenu(); CloseMenu();
ScriptContext2_Enable(); LockPlayerFieldControls();
return 1; return 1;
} }
return 0; return 0;
@ -104,7 +104,7 @@ u8 debug_sub_80B06E0(void)
{ {
debug_sub_80A073C(c2_exit_to_overworld_1_sub_8080DEC); debug_sub_80A073C(c2_exit_to_overworld_1_sub_8080DEC);
CloseMenu(); CloseMenu();
ScriptContext2_Enable(); LockPlayerFieldControls();
return 1; return 1;
} }
return 0; return 0;
@ -123,7 +123,7 @@ u8 Kagaya_80B0734(void)
{ {
debug_sub_811609C(Random() % 6, c2_exit_to_overworld_1_sub_8080DEC); debug_sub_811609C(Random() % 6, c2_exit_to_overworld_1_sub_8080DEC);
CloseMenu(); CloseMenu();
ScriptContext2_Enable(); LockPlayerFieldControls();
return 1; return 1;
} }
return 0; return 0;

70
src/debug/start_menu_debug.c
View File

@ -735,7 +735,7 @@ void DebugMenu_8077020(u8 taskId)
void DebugMenu_8077048(void) void DebugMenu_8077048(void)
{ {
gMenuCallback = DebugMenu_807706C; gMenuCallback = DebugMenu_807706C;
ScriptContext2_Enable(); LockPlayerFieldControls();
CreateTask(DebugMenu_8077020, 80); CreateTask(DebugMenu_8077020, 80);
} }
@ -898,7 +898,7 @@ u8 DebugMenu_OpenWatanabe(void)
{ {
CloseMenu(); CloseMenu();
SetMainCallback2(InitWatanabeDebugMenu); SetMainCallback2(InitWatanabeDebugMenu);
ScriptContext2_Enable(); LockPlayerFieldControls();
return TRUE; return TRUE;
} }
@ -906,7 +906,7 @@ u8 DebugMenu_EndSequenceDemo(void)
{ {
CloseMenu(); CloseMenu();
SetMainCallback2(CB2_StartCreditsSequence); SetMainCallback2(CB2_StartCreditsSequence);
ScriptContext2_Enable(); LockPlayerFieldControls();
return TRUE; return TRUE;
} }
@ -914,7 +914,7 @@ u8 DebugMenu_HallOfFame(void)
{ {
CloseMenu(); CloseMenu();
GameClear(); GameClear();
ScriptContext2_Enable(); LockPlayerFieldControls();
return TRUE; return TRUE;
} }
@ -922,7 +922,7 @@ u8 DebugMenu_OpenSizeComparison(void)
{ {
CloseMenu(); CloseMenu();
InitSizeComparison(); InitSizeComparison();
ScriptContext2_Enable(); LockPlayerFieldControls();
return TRUE; return TRUE;
} }
@ -1002,7 +1002,7 @@ u8 DebugMenu_BattleForDebug(void)
{ {
CloseMenu(); CloseMenu();
InitBattleForDebug(); InitBattleForDebug();
ScriptContext2_Enable(); LockPlayerFieldControls();
return TRUE; return TRUE;
} }
@ -1039,7 +1039,7 @@ u8 DebugMenu_CreatePKMN(void)
{ {
CloseMenu(); CloseMenu();
InitCreatePokemon(); InitCreatePokemon();
ScriptContext2_Enable(); LockPlayerFieldControls();
return TRUE; return TRUE;
} }
@ -1047,7 +1047,7 @@ u8 DebugMenu_ViewPokemonGraphics(void)
{ {
CloseMenu(); CloseMenu();
InitSeePokemonGraphics(); InitSeePokemonGraphics();
ScriptContext2_Enable(); LockPlayerFieldControls();
return TRUE; return TRUE;
} }
@ -1055,7 +1055,7 @@ u8 DebugMenu_OpenSeeTrainers(void)
{ {
CloseMenu(); CloseMenu();
InitSeeTrainers(); InitSeeTrainers();
ScriptContext2_Enable(); LockPlayerFieldControls();
return TRUE; return TRUE;
} }
@ -1094,7 +1094,7 @@ u8 DebugMenu_Teleport(void)
{ {
Overworld_SetWarpDestToLastHealLoc(); Overworld_SetWarpDestToLastHealLoc();
sub_8080E88(); sub_8080E88();
ScriptContext2_Enable(); LockPlayerFieldControls();
CloseMenu(); CloseMenu();
return TRUE; return TRUE;
} }
@ -1377,7 +1377,7 @@ u8 DebugMenu_Safari(void)
ConvertIntToDecimalStringN(gStringVar1, gSafariZoneStepCounter, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar1, gSafariZoneStepCounter, STR_CONV_MODE_RIGHT_ALIGN, 3);
sub_8071F40(Str_839BF0C); sub_8071F40(Str_839BF0C);
gMenuCallback = DebugMenu_8077B3C; gMenuCallback = DebugMenu_8077B3C;
ScriptContext2_Enable(); LockPlayerFieldControls();
return FALSE; return FALSE;
} }
@ -1621,7 +1621,7 @@ u8 DebugMenu_MakeItems()
{ {
CloseMenu(); CloseMenu();
DebugMenu_8077EAC(); DebugMenu_8077EAC();
ScriptContext2_Enable(); LockPlayerFieldControls();
return TRUE; return TRUE;
} }
@ -1698,7 +1698,7 @@ void DebugMenu_8077FFC(u8 taskId)
void DebugMenu_807806C(u8 taskId) void DebugMenu_807806C(u8 taskId)
{ {
Menu_EraseScreen(); Menu_EraseScreen();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskId); DestroyTask(taskId);
DebugMenu_8077048(); DebugMenu_8077048();
} }
@ -1759,7 +1759,7 @@ void DebugMenu_807817C(u8 taskId)
{ {
Menu_EraseScreen(); Menu_EraseScreen();
DestroyTask(taskId); DestroyTask(taskId);
ScriptContext2_Disable(); UnlockPlayerFieldControls();
} }
} }
@ -1786,7 +1786,7 @@ u8 DebugMenu_ViewPortraits(void)
{ {
CloseMenu(); CloseMenu();
CreateTask(DebugMenu_80781A8, 80); CreateTask(DebugMenu_80781A8, 80);
ScriptContext2_Enable(); LockPlayerFieldControls();
return TRUE; return TRUE;
} }
@ -1813,7 +1813,7 @@ u8 DebugMenu_TimeRecords(void)
{ {
CloseMenu(); CloseMenu();
CreateTask(debug_sub_806F9E4, 80); CreateTask(debug_sub_806F9E4, 80);
ScriptContext2_Enable(); LockPlayerFieldControls();
return TRUE; return TRUE;
} }
@ -1821,7 +1821,7 @@ u8 DebugMenu_SetTime(void)
{ {
CloseMenu(); CloseMenu();
debug_sub_806F99C(); debug_sub_806F99C();
ScriptContext2_Enable(); LockPlayerFieldControls();
return TRUE; return TRUE;
} }
@ -1852,13 +1852,13 @@ void DebugMenu_8078310(u8 taskId)
*GetVarPointer(VAR_MIRAGE_RND_H) = data[1]; *GetVarPointer(VAR_MIRAGE_RND_H) = data[1];
Menu_EraseScreen(); Menu_EraseScreen();
DestroyTask(taskId); DestroyTask(taskId);
ScriptContext2_Disable(); UnlockPlayerFieldControls();
} }
else if (JOY_NEW(B_BUTTON)) else if (JOY_NEW(B_BUTTON))
{ {
Menu_EraseScreen(); Menu_EraseScreen();
DestroyTask(taskId); DestroyTask(taskId);
ScriptContext2_Disable(); UnlockPlayerFieldControls();
} }
else if (DebugMenu_8077DD8(data + 1, 0, 0xFFFF, gMain.newAndRepeatedKeys) == TRUE) else if (DebugMenu_8077DD8(data + 1, 0, 0xFFFF, gMain.newAndRepeatedKeys) == TRUE)
DebugMenu_80782EC(data[1]); DebugMenu_80782EC(data[1]);
@ -1870,7 +1870,7 @@ u8 DebugMenu_MiragaIslandRND(void)
{ {
CloseMenu(); CloseMenu();
CreateTask(DebugMenu_8078310, 80); CreateTask(DebugMenu_8078310, 80);
ScriptContext2_Enable(); LockPlayerFieldControls();
return TRUE; return TRUE;
} }
@ -2129,7 +2129,7 @@ bool32 DebugMenu_807860C(u8 taskId)
return FALSE; return FALSE;
case 2: case 2:
Menu_EraseScreen(); Menu_EraseScreen();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskId); DestroyTask(taskId);
return FALSE; return FALSE;
} }
@ -2170,7 +2170,7 @@ void DebugMenu_8078714(u8 taskId)
bool8 DebugMenu_8078758(TaskFunc func) bool8 DebugMenu_8078758(TaskFunc func)
{ {
CloseMenu(); CloseMenu();
ScriptContext2_Enable(); LockPlayerFieldControls();
CreateTask(func, 80); CreateTask(func, 80);
return TRUE; return TRUE;
} }
@ -2243,7 +2243,7 @@ void DebugMenu_8078880(u8 taskId)
if (JOY_NEW(A_BUTTON)) if (JOY_NEW(A_BUTTON))
{ {
Menu_EraseScreen(); Menu_EraseScreen();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskId); DestroyTask(taskId);
} }
break; break;
@ -2255,7 +2255,7 @@ u8 DebugMenu_CellInfo(void)
CloseMenu(); CloseMenu();
CreateTask(DebugMenu_8078880, 80); CreateTask(DebugMenu_8078880, 80);
DebugMenu_80787EC(); DebugMenu_80787EC();
ScriptContext2_Enable(); LockPlayerFieldControls();
return TRUE; return TRUE;
} }
@ -2350,14 +2350,14 @@ void DebugMenu_8078AA4(u8 taskId)
void DebugMenu_8078B38(u8 taskId) void DebugMenu_8078B38(u8 taskId)
{ {
Menu_EraseScreen(); Menu_EraseScreen();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskId); DestroyTask(taskId);
} }
u8 DebugMenu_BattleTowerStages(void) u8 DebugMenu_BattleTowerStages(void)
{ {
CloseMenu(); CloseMenu();
ScriptContext2_Enable(); LockPlayerFieldControls();
CreateTask(DebugMenu_80789CC, 80); CreateTask(DebugMenu_80789CC, 80);
return TRUE; return TRUE;
} }
@ -2438,14 +2438,14 @@ void DebugMenu_8078BD4(u8 taskId)
PlaySE(SE_DING_DONG); PlaySE(SE_DING_DONG);
Menu_EraseScreen(); Menu_EraseScreen();
DestroyTask(taskId); DestroyTask(taskId);
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DebugMenu_8078B94(); DebugMenu_8078B94();
} }
else if (JOY_NEW(B_BUTTON)) else if (JOY_NEW(B_BUTTON))
{ {
Menu_EraseScreen(); Menu_EraseScreen();
DestroyTask(taskId); DestroyTask(taskId);
ScriptContext2_Disable(); UnlockPlayerFieldControls();
} }
else if (DebugMenu_8077DD8(data + 1, 0, 4, gMain.newAndRepeatedKeys) == TRUE) else if (DebugMenu_8077DD8(data + 1, 0, 4, gMain.newAndRepeatedKeys) == TRUE)
{ {
@ -2459,7 +2459,7 @@ u8 DebugMenu_CheckPKBLCK()
{ {
CloseMenu(); CloseMenu();
CreateTask(DebugMenu_8078BD4, 80); CreateTask(DebugMenu_8078BD4, 80);
ScriptContext2_Enable(); LockPlayerFieldControls();
return TRUE; return TRUE;
} }
@ -2676,7 +2676,7 @@ void DebugMenu_8078F68(u8 taskId)
void DebugMenu_8079020(u8 taskId) void DebugMenu_8079020(u8 taskId)
{ {
Menu_EraseScreen(); Menu_EraseScreen();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskId); DestroyTask(taskId);
} }
@ -2684,7 +2684,7 @@ u8 DebugMenu_PTime(void)
{ {
CloseMenu(); CloseMenu();
CreateTask(DebugMenu_8078F1C, 80); CreateTask(DebugMenu_8078F1C, 80);
ScriptContext2_Enable(); LockPlayerFieldControls();
return TRUE; return TRUE;
} }
@ -2728,7 +2728,7 @@ void DebugMenu_8079058(u8 taskId)
gUnknown_Debug_Murakawa2 = 0; gUnknown_Debug_Murakawa2 = 0;
#endif #endif
Menu_EraseScreen(); Menu_EraseScreen();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskId); DestroyTask(taskId);
break; break;
} }
@ -2738,7 +2738,7 @@ u8 DebugMenu_OpenMurakawa(void)
{ {
CloseMenu(); CloseMenu();
CreateTask(DebugMenu_8079058, 80); CreateTask(DebugMenu_8079058, 80);
ScriptContext2_Enable(); LockPlayerFieldControls();
return TRUE; return TRUE;
} }
@ -2770,7 +2770,7 @@ void DebugMenu_8079110(u8 taskId)
if (Menu_UpdateWindowText() && JOY_NEW(A_BUTTON)) if (Menu_UpdateWindowText() && JOY_NEW(A_BUTTON))
{ {
Menu_EraseScreen(); Menu_EraseScreen();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskId); DestroyTask(taskId);
} }
break; break;
@ -2781,7 +2781,7 @@ u8 DebugMenu_OpenKiwa(void)
{ {
CloseMenu(); CloseMenu();
CreateTask(DebugMenu_8079110, 80); CreateTask(DebugMenu_8079110, 80);
ScriptContext2_Enable(); LockPlayerFieldControls();
// return TRUE; // return TRUE;
} }
#endif #endif

2
src/debug/taya_debug_window.c
View File

@ -352,7 +352,7 @@ bool8 debug_sub_8090984(void)
for (i = 0; i < 33; i++) for (i = 0; i < 33; i++)
{ {
sub_80EB890(i); UnlockTrendySaying(i);
} }
} }
CloseMenu(); CloseMenu();

30
src/debug/tomomichi_debug_menu.c
View File

@ -2321,105 +2321,105 @@ static bool8 ControlEvents_Events2_HandleInput(void)
static bool8 CallScript_DoHallOfFame(void) static bool8 CallScript_DoHallOfFame(void)
{ {
ScriptContext1_SetupScript(DebugScript_081C1CFE); ScriptContext_SetupScript(DebugScript_081C1CFE);
CloseMenu(); CloseMenu();
return TRUE; return TRUE;
} }
static bool8 CallScript_GiveCoinCaseIfNotAlreadyOwned(void) static bool8 CallScript_GiveCoinCaseIfNotAlreadyOwned(void)
{ {
ScriptContext1_SetupScript(DebugScript_081C1D07); ScriptContext_SetupScript(DebugScript_081C1D07);
CloseMenu(); CloseMenu();
return TRUE; return TRUE;
} }
static bool8 CallScript_SetOldaleStateAfterRoute103Rival(void) static bool8 CallScript_SetOldaleStateAfterRoute103Rival(void)
{ {
ScriptContext1_SetupScript(DebugScript_081C1D1E); ScriptContext_SetupScript(DebugScript_081C1D1E);
CloseMenu(); CloseMenu();
return TRUE; return TRUE;
} }
static bool8 CallScript_OpenNewMauville(void) static bool8 CallScript_OpenNewMauville(void)
{ {
ScriptContext1_SetupScript(DebugScript_081C1D24); ScriptContext_SetupScript(DebugScript_081C1D24);
CloseMenu(); CloseMenu();
return TRUE; return TRUE;
} }
static bool8 CallScript_GiveSSTicketAndDoHallOfFame(void) static bool8 CallScript_GiveSSTicketAndDoHallOfFame(void)
{ {
ScriptContext1_SetupScript(DebugScript_081C1D2A); ScriptContext_SetupScript(DebugScript_081C1D2A);
CloseMenu(); CloseMenu();
return TRUE; return TRUE;
} }
static bool8 CallScript_GiveKyogreEgg(void) static bool8 CallScript_GiveKyogreEgg(void)
{ {
ScriptContext1_SetupScript(DebugScript_081C1D35); ScriptContext_SetupScript(DebugScript_081C1D35);
CloseMenu(); CloseMenu();
return TRUE; return TRUE;
} }
static bool8 CallScript_GiveAllItems(void) static bool8 CallScript_GiveAllItems(void)
{ {
ScriptContext1_SetupScript(DebugScript_081C1D46); ScriptContext_SetupScript(DebugScript_081C1D46);
CloseMenu(); CloseMenu();
return TRUE; return TRUE;
} }
static bool8 CallScript_GiveAllDecorations(void) static bool8 CallScript_GiveAllDecorations(void)
{ {
ScriptContext1_SetupScript(DebugScript_081C221F); ScriptContext_SetupScript(DebugScript_081C221F);
CloseMenu(); CloseMenu();
return TRUE; return TRUE;
} }
static bool8 CallScript_GiveAllCoins(void) static bool8 CallScript_GiveAllCoins(void)
{ {
ScriptContext1_SetupScript(DebugScript_081C23E2); ScriptContext_SetupScript(DebugScript_081C23E2);
CloseMenu(); CloseMenu();
return TRUE; return TRUE;
} }
static bool8 CallScript_OpenSootopolisGym(void) static bool8 CallScript_OpenSootopolisGym(void)
{ {
ScriptContext1_SetupScript(DebugScript_081C23E6); ScriptContext_SetupScript(DebugScript_081C23E6);
CloseMenu(); CloseMenu();
return TRUE; return TRUE;
} }
static bool8 CallScript_SetMoneyTo0(void) static bool8 CallScript_SetMoneyTo0(void)
{ {
ScriptContext1_SetupScript(DebugScript_081C23F6); ScriptContext_SetupScript(DebugScript_081C23F6);
CloseMenu(); CloseMenu();
return TRUE; return TRUE;
} }
static bool8 CallScript_FillPartyWithBarboach(void) static bool8 CallScript_FillPartyWithBarboach(void)
{ {
ScriptContext1_SetupScript(DebugScript_081C2482); ScriptContext_SetupScript(DebugScript_081C2482);
CloseMenu(); CloseMenu();
return TRUE; return TRUE;
} }
static bool8 CallScript_FillPartyWithShroomish(void) static bool8 CallScript_FillPartyWithShroomish(void)
{ {
ScriptContext1_SetupScript(DebugScript_081C23FD); ScriptContext_SetupScript(DebugScript_081C23FD);
CloseMenu(); CloseMenu();
return TRUE; return TRUE;
} }
static bool8 CallScript_GiveBarboachEgg(void) static bool8 CallScript_GiveBarboachEgg(void)
{ {
ScriptContext1_SetupScript(DebugScript_081C2518); ScriptContext_SetupScript(DebugScript_081C2518);
CloseMenu(); CloseMenu();
return TRUE; return TRUE;
} }
static bool8 CallScript_GiveShroomishEgg(void) static bool8 CallScript_GiveShroomishEgg(void)
{ {
ScriptContext1_SetupScript(DebugScript_081C2507); ScriptContext_SetupScript(DebugScript_081C2507);
CloseMenu(); CloseMenu();
return TRUE; return TRUE;
} }

4
src/debug/watanabe_debug_menu.c
View File

@ -239,7 +239,7 @@ void debug_80C370C(void)
void debug_80C373C(u8 taskId) void debug_80C373C(u8 taskId)
{ {
DestroyTask(taskId); DestroyTask(taskId);
ScriptContext2_Disable(); UnlockPlayerFieldControls();
SetMainCallback2(sub_80546F0); SetMainCallback2(sub_80546F0);
} }
@ -373,7 +373,7 @@ void InitWatanabeDebugMenu(void)
case 3: case 3:
if (!IsSEPlaying()) if (!IsSEPlaying())
{ {
ScriptContext2_Disable(); UnlockPlayerFieldControls();
SetMainCallback2(sub_80546F0); SetMainCallback2(sub_80546F0);
} }
break; break;

14
src/decoration.c
View File

@ -1443,7 +1443,7 @@ void sub_80FE1DC(void)
void sub_80FE220(void) void sub_80FE220(void)
{ {
gUnknown_020388D4 = 0; gUnknown_020388D4 = 0;
ScriptContext2_Enable(); LockPlayerFieldControls();
sub_80FE1DC(); sub_80FE1DC();
sub_80FE394(); sub_80FE394();
} }
@ -1524,7 +1524,7 @@ void gpu_pal_decompress_alloc_tag_and_upload(u8 taskId)
FreeSpritePaletteByTag(6); FreeSpritePaletteByTag(6);
if (sDecorationContext.isPlayerRoom == 0) if (sDecorationContext.isPlayerRoom == 0)
{ {
ScriptContext1_SetupScript(SecretBase_EventScript_PCCancel); ScriptContext_SetupScript(SecretBase_EventScript_PCCancel);
DestroyTask(taskId); DestroyTask(taskId);
} else } else
{ {
@ -2564,7 +2564,7 @@ void sub_81000C4(u8 taskId)
{ {
gUnknown_020391A4 = gTasks[taskId].data[0] - 7; gUnknown_020391A4 = gTasks[taskId].data[0] - 7;
gUnknown_020391A6 = gTasks[taskId].data[1] - 7; gUnknown_020391A6 = gTasks[taskId].data[1] - 7;
ScriptContext1_SetupScript(gUnknown_081A2F7B); ScriptContext_SetupScript(gUnknown_081A2F7B);
} }
gSprites[gUnknown_020391A8].y += 2; gSprites[gUnknown_020391A8].y += 2;
sub_810028C(taskId); sub_810028C(taskId);
@ -2629,7 +2629,7 @@ void c1_overworld_prev_quest(u8 taskId)
switch (gTasks[taskId].data[2]) switch (gTasks[taskId].data[2])
{ {
case 0: case 0:
ScriptContext2_Enable(); LockPlayerFieldControls();
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
sub_80FF114(taskId); sub_80FF114(taskId);
@ -2656,7 +2656,7 @@ void sub_8100334(u8 taskId)
void sub_8100364(void) void sub_8100364(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
LoadScrollIndicatorPalette(); LoadScrollIndicatorPalette();
pal_fill_black(); pal_fill_black();
sub_80FE7EC(CreateTask(sub_8100334, 8)); sub_80FE7EC(CreateTask(sub_8100334, 8));
@ -3147,13 +3147,13 @@ void sub_8100C88(u8 taskId)
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
DrawWholeMapView(); DrawWholeMapView();
ScriptContext1_SetupScript(gUnknown_081A2F8A); ScriptContext_SetupScript(gUnknown_081A2F8A);
Menu_EraseWindowRect(0, 0, 29, 19); Menu_EraseWindowRect(0, 0, 29, 19);
gTasks[taskId].data[2] = 2; gTasks[taskId].data[2] = 2;
} }
break; break;
case 2: case 2:
ScriptContext2_Enable(); LockPlayerFieldControls();
sub_80FED90(taskId); sub_80FED90(taskId);
pal_fill_black(); pal_fill_black();
gTasks[taskId].data[2] = 3; gTasks[taskId].data[2] = 3;

4
src/easy_chat_2.c
View File

@ -2925,7 +2925,7 @@ u8 sub_80EB868(u8 arg0)
return (gSaveBlock1.unk2D8C[index] >> offset) & 1; return (gSaveBlock1.unk2D8C[index] >> offset) & 1;
} }
void sub_80EB890(u8 arg0) void UnlockTrendySaying(u8 arg0)
{ {
int offset; int offset;
int index; int index;
@ -2966,7 +2966,7 @@ u16 sub_80EB8EC(void)
{ {
if (local2 == 0) if (local2 == 0)
{ {
sub_80EB890(i); UnlockTrendySaying(i);
return (i & 0x1FF) | 0x2800; return (i & 0x1FF) | 0x2800;
} }
local2--; local2--;

2
src/egg_hatch.c
View File

@ -379,7 +379,7 @@ static void VBlankCB_EggHatch(void)
void EggHatch(void) void EggHatch(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
CreateTask(Task_EggHatch, 10); CreateTask(Task_EggHatch, 10);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
} }

20
src/field_control_avatar.c
View File

@ -324,7 +324,7 @@ static bool8 TryStartInteractionScript(struct MapPosition *position, u16 metatil
&& script != EventScript_PC) && script != EventScript_PC)
PlaySE(5); PlaySE(5);
ScriptContext1_SetupScript(script); ScriptContext_SetupScript(script);
return TRUE; return TRUE;
} }
@ -520,7 +520,7 @@ static bool32 TrySetupDiveDownScript(void)
{ {
if (FlagGet(FLAG_BADGE07_GET) && TrySetDiveWarp() == 2) if (FlagGet(FLAG_BADGE07_GET) && TrySetDiveWarp() == 2)
{ {
ScriptContext1_SetupScript(UseDiveScript); ScriptContext_SetupScript(UseDiveScript);
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
@ -530,7 +530,7 @@ static bool32 TrySetupDiveEmergeScript(void)
{ {
if (FlagGet(FLAG_BADGE07_GET) && gMapHeader.mapType == MAP_TYPE_UNDERWATER && TrySetDiveWarp() == 1) if (FlagGet(FLAG_BADGE07_GET) && gMapHeader.mapType == MAP_TYPE_UNDERWATER && TrySetDiveWarp() == 1)
{ {
ScriptContext1_SetupScript(S_UseDiveUnderwater); ScriptContext_SetupScript(S_UseDiveUnderwater);
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
@ -557,7 +557,7 @@ bool8 TryStartCoordEventScript(struct MapPosition *position)
if (script == NULL) if (script == NULL)
return FALSE; return FALSE;
ScriptContext1_SetupScript(script); ScriptContext_SetupScript(script);
return TRUE; return TRUE;
} }
@ -565,7 +565,7 @@ bool8 TryStartCrackedFloorHoleScript(u16 metatileBehavior)
{ {
if (MetatileBehavior_IsCrackedFloorHole(metatileBehavior)) if (MetatileBehavior_IsCrackedFloorHole(metatileBehavior))
{ {
ScriptContext1_SetupScript(EventScript_FallDownHole); ScriptContext_SetupScript(EventScript_FallDownHole);
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
@ -577,20 +577,20 @@ bool8 TryStartStepCountScript(void)
UpdateHappinessStep(); UpdateHappinessStep();
if (UpdatePoisonStepCounter() == TRUE) if (UpdatePoisonStepCounter() == TRUE)
{ {
ScriptContext1_SetupScript(gUnknown_081A14B8); ScriptContext_SetupScript(gUnknown_081A14B8);
return TRUE; return TRUE;
} }
if (ShouldEggHatch()) if (ShouldEggHatch())
{ {
IncrementGameStat(GAME_STAT_HATCHED_EGGS); IncrementGameStat(GAME_STAT_HATCHED_EGGS);
ScriptContext1_SetupScript(S_EggHatch); ScriptContext_SetupScript(S_EggHatch);
return TRUE; return TRUE;
} }
if (SafariZoneTakeStep() == TRUE) if (SafariZoneTakeStep() == TRUE)
return TRUE; return TRUE;
if (CountSSTidalStep(1) == TRUE) if (CountSSTidalStep(1) == TRUE)
{ {
ScriptContext1_SetupScript(gUnknown_0815FD0D); ScriptContext_SetupScript(gUnknown_0815FD0D);
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
@ -719,7 +719,7 @@ bool8 TryStartWarpEventScript(struct MapPosition *position, u16 metatileBehavior
} }
if (MetatileBehavior_IsMtPyreHole(metatileBehavior) == TRUE) if (MetatileBehavior_IsMtPyreHole(metatileBehavior) == TRUE)
{ {
ScriptContext1_SetupScript(EventScript_FallDownHoleMtPyre); ScriptContext_SetupScript(EventScript_FallDownHoleMtPyre);
return TRUE; return TRUE;
} }
sub_8080E88(); sub_8080E88();
@ -837,7 +837,7 @@ static const u8 *TryRunCoordEventScript(const struct CoordEvent *coordEvent)
} }
if (coordEvent->trigger == 0) if (coordEvent->trigger == 0)
{ {
ScriptContext2_RunNewScript(coordEvent->script); RunScriptImmediately(coordEvent->script);
return NULL; return NULL;
} }
if (VarGet(coordEvent->trigger) == (u8)coordEvent->index) if (VarGet(coordEvent->trigger) == (u8)coordEvent->index)

42
src/field_effect.c
View File

@ -954,7 +954,7 @@ void mapldr_080842E8(void)
{ {
pal_fill_black(); pal_fill_black();
CreateTask(task00_8084310, 0); CreateTask(task00_8084310, 0);
ScriptContext2_Enable(); LockPlayerFieldControls();
FreezeObjectEvents(); FreezeObjectEvents();
gFieldCallback = NULL; gFieldCallback = NULL;
} }
@ -997,7 +997,7 @@ void mapldr_08084390(void)
{ {
ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_WEST); ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_WEST);
} }
ScriptContext2_Enable(); LockPlayerFieldControls();
FreezeObjectEvents(); FreezeObjectEvents();
gFieldCallback = NULL; gFieldCallback = NULL;
} }
@ -1017,7 +1017,7 @@ void c3_080843F8(u8 taskId)
} }
if (!FieldEffectActiveListContains(FLDEFF_FLY_IN)) if (!FieldEffectActiveListContains(FLDEFF_FLY_IN))
{ {
ScriptContext2_Disable(); UnlockPlayerFieldControls();
UnfreezeObjectEvents(); UnfreezeObjectEvents();
DestroyTask(taskId); DestroyTask(taskId);
} }
@ -1031,7 +1031,7 @@ void sub_8086748(void)
{ {
Overworld_PlaySpecialMapMusic(); Overworld_PlaySpecialMapMusic();
pal_fill_for_map_transition(); pal_fill_for_map_transition();
ScriptContext2_Enable(); LockPlayerFieldControls();
FreezeObjectEvents(); FreezeObjectEvents();
CreateTask(sub_8086774, 0); CreateTask(sub_8086774, 0);
gFieldCallback = NULL; gFieldCallback = NULL;
@ -1148,7 +1148,7 @@ bool8 sub_80869B8(struct Task *task)
bool8 sub_80869F8(struct Task *task) bool8 sub_80869F8(struct Task *task)
{ {
gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.preventStep = FALSE;
ScriptContext2_Disable(); UnlockPlayerFieldControls();
CameraObjectReset1(); CameraObjectReset1();
UnfreezeObjectEvents(); UnfreezeObjectEvents();
InstallCameraPanAheadCallback(); InstallCameraPanAheadCallback();
@ -1299,7 +1299,7 @@ void sub_8086C94(void)
{ {
Overworld_PlaySpecialMapMusic(); Overworld_PlaySpecialMapMusic();
pal_fill_for_map_transition(); pal_fill_for_map_transition();
ScriptContext2_Enable(); LockPlayerFieldControls();
CreateTask(sub_8086CBC, 0); CreateTask(sub_8086CBC, 0);
gFieldCallback = NULL; gFieldCallback = NULL;
} }
@ -1416,7 +1416,7 @@ bool8 sub_8086ED4(struct Task *task)
if (ObjectEventClearHeldMovementIfFinished(objectEvent)) if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{ {
CameraObjectReset1(); CameraObjectReset1();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
ObjectEventSetHeldMovement(objectEvent, GetWalkNormalMovementAction(DIR_EAST)); ObjectEventSetHeldMovement(objectEvent, GetWalkNormalMovementAction(DIR_EAST));
DestroyTask(FindTaskIdByFunc(sub_8086CBC)); DestroyTask(FindTaskIdByFunc(sub_8086CBC));
} }
@ -1441,7 +1441,7 @@ void sub_8086F64(u8 taskId)
bool8 sub_8086FB0(struct Task *task, struct ObjectEvent *objectEvent) bool8 sub_8086FB0(struct Task *task, struct ObjectEvent *objectEvent)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
gPlayerAvatar.preventStep = TRUE; gPlayerAvatar.preventStep = TRUE;
task->data[0]++; task->data[0]++;
return FALSE; return FALSE;
@ -1449,7 +1449,7 @@ bool8 sub_8086FB0(struct Task *task, struct ObjectEvent *objectEvent)
bool8 waterfall_1_do_anim_probably(struct Task *task, struct ObjectEvent *objectEvent) bool8 waterfall_1_do_anim_probably(struct Task *task, struct ObjectEvent *objectEvent)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
if (!ObjectEventIsMovementOverridden(objectEvent)) if (!ObjectEventIsMovementOverridden(objectEvent))
{ {
ObjectEventClearHeldMovementIfFinished(objectEvent); ObjectEventClearHeldMovementIfFinished(objectEvent);
@ -1488,7 +1488,7 @@ bool8 sub_8087058(struct Task *task, struct ObjectEvent *objectEvent)
task->data[0] = 3; task->data[0] = 3;
return TRUE; return TRUE;
} }
ScriptContext2_Disable(); UnlockPlayerFieldControls();
gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.preventStep = FALSE;
DestroyTask(FindTaskIdByFunc(sub_8086F64)); DestroyTask(FindTaskIdByFunc(sub_8086F64));
FieldEffectActiveListRemove(FLDEFF_USE_WATERFALL); FieldEffectActiveListRemove(FLDEFF_USE_WATERFALL);
@ -1521,7 +1521,7 @@ bool8 sub_8087124(struct Task *task)
bool8 dive_2_unknown(struct Task *task) bool8 dive_2_unknown(struct Task *task)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
gFieldEffectArguments[0] = task->data[15]; gFieldEffectArguments[0] = task->data[15];
FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
task->data[0]++; task->data[0]++;
@ -1662,7 +1662,7 @@ void mapldr_080851BC(void)
{ {
Overworld_PlaySpecialMapMusic(); Overworld_PlaySpecialMapMusic();
pal_fill_for_map_transition(); pal_fill_for_map_transition();
ScriptContext2_Enable(); LockPlayerFieldControls();
gFieldCallback = NULL; gFieldCallback = NULL;
CreateTask(sub_8087470, 0); CreateTask(sub_8087470, 0);
} }
@ -1715,7 +1715,7 @@ bool8 sub_808759C(struct Task *task, struct ObjectEvent *objectEvent, struct Spr
if (ObjectEventClearHeldMovementIfFinished(objectEvent)) if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{ {
gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.preventStep = FALSE;
ScriptContext2_Disable(); UnlockPlayerFieldControls();
UnfreezeObjectEvents(); UnfreezeObjectEvents();
DestroyTask(FindTaskIdByFunc(sub_8087470)); DestroyTask(FindTaskIdByFunc(sub_8087470));
} }
@ -1843,7 +1843,7 @@ void sub_808788C(struct Sprite *sprite)
void StartEscapeRopeFieldEffect(void) void StartEscapeRopeFieldEffect(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
FreezeObjectEvents(); FreezeObjectEvents();
CreateTask(DoEscapeRopeFieldEffect, 0x50); CreateTask(DoEscapeRopeFieldEffect, 0x50);
} }
@ -1911,7 +1911,7 @@ void mapldr_080859D4(void)
{ {
Overworld_PlaySpecialMapMusic(); Overworld_PlaySpecialMapMusic();
pal_fill_for_map_transition(); pal_fill_for_map_transition();
ScriptContext2_Enable(); LockPlayerFieldControls();
FreezeObjectEvents(); FreezeObjectEvents();
gFieldCallback = NULL; gFieldCallback = NULL;
gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
@ -1945,7 +1945,7 @@ void sub_8087AC8(struct Task *task)
if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection()) if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection())
{ {
objectEvent->invisible = FALSE; objectEvent->invisible = FALSE;
ScriptContext2_Disable(); UnlockPlayerFieldControls();
UnfreezeObjectEvents(); UnfreezeObjectEvents();
DestroyTask(FindTaskIdByFunc(sub_8087A74)); DestroyTask(FindTaskIdByFunc(sub_8087A74));
return; return;
@ -1986,7 +1986,7 @@ static void ExecuteTeleportFieldEffectTask(u8 taskId)
static void TeleportFieldEffectTask1(struct Task *task) static void TeleportFieldEffectTask1(struct Task *task)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
FreezeObjectEvents(); FreezeObjectEvents();
CameraObjectReset2(); CameraObjectReset2();
task->data[15] = GetPlayerFacingDirection(); task->data[15] = GetPlayerFacingDirection();
@ -2059,7 +2059,7 @@ static void mapldr_08085D88(void)
{ {
Overworld_PlaySpecialMapMusic(); Overworld_PlaySpecialMapMusic();
pal_fill_for_map_transition(); pal_fill_for_map_transition();
ScriptContext2_Enable(); LockPlayerFieldControls();
FreezeObjectEvents(); FreezeObjectEvents();
gFieldCallback = NULL; gFieldCallback = NULL;
gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
@ -2146,7 +2146,7 @@ void sub_8087FDC(struct Task *task)
task->data[1] = 8; task->data[1] = 8;
if ((++task->data[2]) > 4 && task->data[14] == objectEvent->facingDirection) if ((++task->data[2]) > 4 && task->data[14] == objectEvent->facingDirection)
{ {
ScriptContext2_Disable(); UnlockPlayerFieldControls();
CameraObjectReset1(); CameraObjectReset1();
UnfreezeObjectEvents(); UnfreezeObjectEvents();
DestroyTask(FindTaskIdByFunc(sub_8087E1C)); DestroyTask(FindTaskIdByFunc(sub_8087E1C));
@ -2600,7 +2600,7 @@ void sub_8088954(u8 taskId)
void sub_8088984(struct Task *task) void sub_8088984(struct Task *task)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
FreezeObjectEvents(); FreezeObjectEvents();
gPlayerAvatar.preventStep = TRUE; gPlayerAvatar.preventStep = TRUE;
SetPlayerAvatarStateMask(8); SetPlayerAvatarStateMask(8);
@ -2661,7 +2661,7 @@ void sub_8088AF4(struct Task *task)
ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(objectEvent->movementDirection)); ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(objectEvent->movementDirection));
sub_8127ED0(objectEvent->fieldEffectSpriteId, 1); sub_8127ED0(objectEvent->fieldEffectSpriteId, 1);
UnfreezeObjectEvents(); UnfreezeObjectEvents();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
FieldEffectActiveListRemove(FLDEFF_USE_SURF); FieldEffectActiveListRemove(FLDEFF_USE_SURF);
DestroyTask(FindTaskIdByFunc(sub_8088954)); DestroyTask(FindTaskIdByFunc(sub_8088954));
} }

66
src/field_fadetransition.c
View File

@ -84,13 +84,13 @@ void task0A_asap_script_env_2_enable_and_set_ctx_running(u8 taskID)
if (sub_8080E70() == TRUE) if (sub_8080E70() == TRUE)
{ {
DestroyTask(taskID); DestroyTask(taskID);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
} }
void sub_8080990(void) void sub_8080990(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
Overworld_PlaySpecialMapMusic(); Overworld_PlaySpecialMapMusic();
pal_fill_black(); pal_fill_black();
CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10); CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10);
@ -98,7 +98,7 @@ void sub_8080990(void)
void sub_80809B0(void) void sub_80809B0(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
pal_fill_black(); pal_fill_black();
CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10); CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10);
} }
@ -123,7 +123,7 @@ void task_mpl_807DD60(u8 taskId)
case 2: case 2:
if (sub_8080E70() == TRUE) if (sub_8080E70() == TRUE)
{ {
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskId); DestroyTask(taskId);
} }
} }
@ -131,7 +131,7 @@ void task_mpl_807DD60(u8 taskId)
void sub_8080A3C(void) void sub_8080A3C(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
Overworld_PlaySpecialMapMusic(); Overworld_PlaySpecialMapMusic();
palette_bg_fill_black(); palette_bg_fill_black();
CreateTask(task_mpl_807DD60, 10); CreateTask(task_mpl_807DD60, 10);
@ -158,7 +158,7 @@ void sub_8080A5C(u8 taskId)
if (sub_8080E70() == TRUE) if (sub_8080E70() == TRUE)
{ {
sub_8007B14(); sub_8007B14();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskId); DestroyTask(taskId);
} }
} }
@ -166,7 +166,7 @@ void sub_8080A5C(u8 taskId)
void sub_8080AC4(void) void sub_8080AC4(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
Overworld_PlaySpecialMapMusic(); Overworld_PlaySpecialMapMusic();
palette_bg_fill_black(); palette_bg_fill_black();
CreateTask(sub_8080A5C, 10); CreateTask(sub_8080A5C, 10);
@ -193,7 +193,7 @@ void mapldr_default(void)
Overworld_PlaySpecialMapMusic(); Overworld_PlaySpecialMapMusic();
pal_fill_for_map_transition(); pal_fill_for_map_transition();
sub_8080AE4(); sub_8080AE4();
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
void sub_8080B60(void) void sub_8080B60(void)
@ -201,7 +201,7 @@ void sub_8080B60(void)
Overworld_PlaySpecialMapMusic(); Overworld_PlaySpecialMapMusic();
pal_fill_black(); pal_fill_black();
sub_8080AE4(); sub_8080AE4();
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
void sub_8080B78(void) void sub_8080B78(void)
@ -210,7 +210,7 @@ void sub_8080B78(void)
pal_fill_for_map_transition(); pal_fill_for_map_transition();
PlaySE(SE_WARP_OUT); PlaySE(SE_WARP_OUT);
CreateTask(task_map_chg_seq_0807E2CC, 10); CreateTask(task_map_chg_seq_0807E2CC, 10);
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
void sub_8080B9C(u8 taskId) void sub_8080B9C(u8 taskId)
@ -256,7 +256,7 @@ void sub_8080B9C(u8 taskId)
} }
break; break;
case 4: case 4:
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskId); DestroyTask(taskId);
break; break;
} }
@ -294,7 +294,7 @@ void task_map_chg_seq_0807E20C(u8 taskId)
} }
break; break;
case 3: case 3:
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskId); DestroyTask(taskId);
break; break;
} }
@ -306,14 +306,14 @@ void task_map_chg_seq_0807E2CC(u8 taskId)
{ {
case 0: case 0:
FreezeObjectEvents(); FreezeObjectEvents();
ScriptContext2_Enable(); LockPlayerFieldControls();
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
break; break;
case 1: case 1:
if (sub_8080E70()) if (sub_8080E70())
{ {
UnfreezeObjectEvents(); UnfreezeObjectEvents();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskId); DestroyTask(taskId);
} }
break; break;
@ -333,14 +333,14 @@ void sub_8080DEC(void)
{ {
pal_fill_black(); pal_fill_black();
CreateStartMenuTask(sub_8080DC4); CreateStartMenuTask(sub_8080DC4);
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
void task_mpl_807E3C8(u8 taskId) void task_mpl_807E3C8(u8 taskId)
{ {
if (sub_8080E70() == 1) if (sub_8080E70() == 1)
{ {
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskId); DestroyTask(taskId);
ScriptUnfreezeObjectEvents(); ScriptUnfreezeObjectEvents();
} }
@ -348,14 +348,14 @@ void task_mpl_807E3C8(u8 taskId)
void sub_8080E28(void) void sub_8080E28(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
pal_fill_black(); pal_fill_black();
CreateTask(task_mpl_807E3C8, 10); CreateTask(task_mpl_807E3C8, 10);
} }
void sub_8080E44(void) void sub_8080E44(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
Overworld_PlaySpecialMapMusic(); Overworld_PlaySpecialMapMusic();
pal_fill_black(); pal_fill_black();
CreateTask(task_mpl_807E3C8, 10); CreateTask(task_mpl_807E3C8, 10);
@ -376,7 +376,7 @@ bool32 sub_8080E70(void)
void sub_8080E88(void) void sub_8080E88(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
TryFadeOutOldMapMusic(); TryFadeOutOldMapMusic();
WarpFadeScreen(); WarpFadeScreen();
PlayRainSoundEffect(); PlayRainSoundEffect();
@ -387,7 +387,7 @@ void sub_8080E88(void)
void sp13E_warp_to_last_warp(void) void sp13E_warp_to_last_warp(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
TryFadeOutOldMapMusic(); TryFadeOutOldMapMusic();
WarpFadeScreen(); WarpFadeScreen();
PlayRainSoundEffect(); PlayRainSoundEffect();
@ -397,7 +397,7 @@ void sp13E_warp_to_last_warp(void)
void sub_8080EF0(void) void sub_8080EF0(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
gFieldCallback = mapldr_default; gFieldCallback = mapldr_default;
CreateTask(sub_808115C, 10); CreateTask(sub_808115C, 10);
} }
@ -410,25 +410,25 @@ void DoFallWarp(void)
void sub_8080F2C(u8 metatileBehavior) void sub_8080F2C(u8 metatileBehavior)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
sub_8086A2C(metatileBehavior, 10); sub_8086A2C(metatileBehavior, 10);
} }
void sub_8080F48(void) void sub_8080F48(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
sub_80871B8(10); sub_80871B8(10);
} }
void sub_8080F58(void) void sub_8080F58(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
sub_8087654(10); sub_8087654(10);
} }
void sub_8080F68(void) void sub_8080F68(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
TryFadeOutOldMapMusic(); TryFadeOutOldMapMusic();
WarpFadeScreen(); WarpFadeScreen();
PlaySE(SE_WARP_IN); PlaySE(SE_WARP_IN);
@ -438,7 +438,7 @@ void sub_8080F68(void)
void sub_8080F9C(void) void sub_8080F9C(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
WarpFadeScreen(); WarpFadeScreen();
CreateTask(task0A_fade_n_map_maybe, 10); CreateTask(task0A_fade_n_map_maybe, 10);
gFieldCallback = sub_80C791C; gFieldCallback = sub_80C791C;
@ -451,7 +451,7 @@ static void WaitCableClubWarp(u8 taskId)
switch (task->data[0]) switch (task->data[0])
{ {
case 0: case 0:
ScriptContext2_Enable(); LockPlayerFieldControls();
task->data[0]++; task->data[0]++;
break; break;
case 1: case 1:
@ -468,7 +468,7 @@ static void WaitCableClubWarp(u8 taskId)
void DoCableClubWarp(void) void DoCableClubWarp(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
TryFadeOutOldMapMusic(); TryFadeOutOldMapMusic();
WarpFadeScreen(); WarpFadeScreen();
PlaySE(SE_EXIT); PlaySE(SE_EXIT);
@ -517,12 +517,12 @@ void debug_sub_80888D8()
{ {
debug_sub_8052E04(); debug_sub_8052E04();
sub_8080E88(); sub_8080E88();
ScriptContext2_Enable(); LockPlayerFieldControls();
/* asm("\ /* asm("\
PUSH {LR}\n\ PUSH {LR}\n\
BL debug_sub_8052E04\n\ BL debug_sub_8052E04\n\
BL sub_8080E88\n\ BL sub_8080E88\n\
BL ScriptContext2_Enable\n\ BL LockPlayerFieldControls\n\
POP {R0}\n\ POP {R0}\n\
BX R0");*/ BX R0");*/
} }
@ -537,7 +537,7 @@ void task0A_fade_n_map_maybe(u8 taskId)
{ {
case 0: case 0:
FreezeObjectEvents(); FreezeObjectEvents();
ScriptContext2_Enable(); LockPlayerFieldControls();
task->data[0]++; task->data[0]++;
break; break;
case 1: case 1:
@ -615,7 +615,7 @@ void sub_80812C8(u8 taskId)
{ {
case 0: case 0:
FreezeObjectEvents(); FreezeObjectEvents();
ScriptContext2_Enable(); LockPlayerFieldControls();
task->data[0]++; task->data[0]++;
break; break;
case 1: case 1:
@ -634,7 +634,7 @@ void sub_80812C8(u8 taskId)
void sub_8081334(void) void sub_8081334(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
TryFadeOutOldMapMusic(); TryFadeOutOldMapMusic();
WarpFadeScreen(); WarpFadeScreen();
PlayRainSoundEffect(); PlayRainSoundEffect();

18
src/field_player_avatar.c
View File

@ -1282,7 +1282,7 @@ static void Task_BumpBoulder(u8 taskId)
static bool8 sub_8059E84(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject) static bool8 sub_8059E84(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
gPlayerAvatar.preventStep = TRUE; gPlayerAvatar.preventStep = TRUE;
task->data[0]++; task->data[0]++;
return FALSE; return FALSE;
@ -1316,7 +1316,7 @@ static bool8 sub_8059F40(struct Task *task, struct ObjectEvent *playerObject, st
ObjectEventClearHeldMovementIfFinished(playerObject); ObjectEventClearHeldMovementIfFinished(playerObject);
ObjectEventClearHeldMovementIfFinished(strengthObject); ObjectEventClearHeldMovementIfFinished(strengthObject);
gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.preventStep = FALSE;
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(FindTaskIdByFunc(Task_BumpBoulder)); DestroyTask(FindTaskIdByFunc(Task_BumpBoulder));
} }
return FALSE; return FALSE;
@ -1374,7 +1374,7 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct Objec
task->data[0]++; task->data[0]++;
task->data[1] = objectEvent->movementDirection; task->data[1] = objectEvent->movementDirection;
gPlayerAvatar.preventStep = TRUE; gPlayerAvatar.preventStep = TRUE;
ScriptContext2_Enable(); LockPlayerFieldControls();
PlaySE(SE_WARP_IN); PlaySE(SE_WARP_IN);
return TRUE; return TRUE;
} }
@ -1420,7 +1420,7 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct Objec
if (ObjectEventClearHeldMovementIfFinished(objectEvent)) if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{ {
ObjectEventSetHeldMovement(objectEvent, GetWalkSlowMovementAction(GetOppositeDirection(task->data[1]))); ObjectEventSetHeldMovement(objectEvent, GetWalkSlowMovementAction(GetOppositeDirection(task->data[1])));
ScriptContext2_Disable(); UnlockPlayerFieldControls();
gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.preventStep = FALSE;
DestroyTask(FindTaskIdByFunc(PlayerAvatar_DoSecretBaseMatSpin)); DestroyTask(FindTaskIdByFunc(PlayerAvatar_DoSecretBaseMatSpin));
} }
@ -1433,7 +1433,7 @@ static void sub_805A20C(u8 a)
{ {
u8 taskId; u8 taskId;
ScriptContext2_Enable(); LockPlayerFieldControls();
Overworld_ClearSavedMusic(); Overworld_ClearSavedMusic();
Overworld_ChangeMusicToDefault(); Overworld_ChangeMusicToDefault();
gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_SURFING; gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_SURFING;
@ -1467,7 +1467,7 @@ static void sub_805A2D0(u8 taskId)
ObjectEventSetGraphicsId(playerObjEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); ObjectEventSetGraphicsId(playerObjEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL));
ObjectEventSetHeldMovement(playerObjEvent, GetFaceDirectionMovementAction(playerObjEvent->facingDirection)); ObjectEventSetHeldMovement(playerObjEvent, GetFaceDirectionMovementAction(playerObjEvent->facingDirection));
gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.preventStep = FALSE;
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroySprite(&gSprites[playerObjEvent->fieldEffectSpriteId]); DestroySprite(&gSprites[playerObjEvent->fieldEffectSpriteId]);
DestroyTask(taskId); DestroyTask(taskId);
} }
@ -1527,7 +1527,7 @@ static void Task_Fishing(u8 taskId)
static bool8 Fishing1(struct Task *task) static bool8 Fishing1(struct Task *task)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
gPlayerAvatar.preventStep = TRUE; gPlayerAvatar.preventStep = TRUE;
task->tStep++; task->tStep++;
return FALSE; return FALSE;
@ -1714,7 +1714,7 @@ static bool8 Fishing11(struct Task *task)
if (task->tFrameCounter != 0) if (task->tFrameCounter != 0)
{ {
gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.preventStep = FALSE;
ScriptContext2_Disable(); UnlockPlayerFieldControls();
FishingWildEncounter(task->tFishingRod); FishingWildEncounter(task->tFishingRod);
sub_80BE97C(1); sub_80BE97C(1);
DestroyTask(FindTaskIdByFunc(Task_Fishing)); DestroyTask(FindTaskIdByFunc(Task_Fishing));
@ -1774,7 +1774,7 @@ static bool8 Fishing16(struct Task *task)
if (Menu_UpdateWindowText()) if (Menu_UpdateWindowText())
{ {
gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.preventStep = FALSE;
ScriptContext2_Disable(); UnlockPlayerFieldControls();
UnfreezeObjectEvents(); UnfreezeObjectEvents();
Menu_EraseScreen(); Menu_EraseScreen();
sub_80BE97C(0); sub_80BE97C(0);

4
src/field_poison.c
View File

@ -95,7 +95,7 @@ static void Task_WhiteOut(u8 taskId)
gSpecialVar_Result = 1; gSpecialVar_Result = 1;
else else
gSpecialVar_Result = 0; gSpecialVar_Result = 0;
EnableBothScriptContexts(); ScriptContext_Enable();
DestroyTask(taskId); DestroyTask(taskId);
break; break;
} }
@ -107,7 +107,7 @@ static void Task_WhiteOut(u8 taskId)
void ExecuteWhiteOut(void) void ExecuteWhiteOut(void)
{ {
CreateTask(Task_WhiteOut, 0x50); CreateTask(Task_WhiteOut, 0x50);
ScriptContext1_Stop(); ScriptContext_Stop();
} }
s32 DoPoisonFieldEffect(void) s32 DoPoisonFieldEffect(void)

10
src/field_screen_effect.c
View File

@ -102,7 +102,7 @@ static void sub_80814E8(u8 taskId)
{ {
if (!FuncIsActiveTask(UpdateFlashLevelEffect)) if (!FuncIsActiveTask(UpdateFlashLevelEffect))
{ {
EnableBothScriptContexts(); ScriptContext_Enable();
DestroyTask(taskId); DestroyTask(taskId);
} }
} }
@ -145,7 +145,7 @@ void sub_8081594(u8 flashLevel)
value = 1; value = 1;
sub_8081534(120, 80, sFlashLevelPixelRadii[curFlashLevel], sFlashLevelPixelRadii[flashLevel], value, 1); sub_8081534(120, 80, sFlashLevelPixelRadii[curFlashLevel], sFlashLevelPixelRadii[flashLevel], value, 1);
sub_8081510(); sub_8081510();
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
void WriteFlashScanlineEffectBuffer(u8 flashLevel) void WriteFlashScanlineEffectBuffer(u8 flashLevel)
@ -234,7 +234,7 @@ static void sub_80816A8(u8 taskId)
case 2: case 2:
if (!FuncIsActiveTask(UpdateFlashLevelEffect)) if (!FuncIsActiveTask(UpdateFlashLevelEffect))
{ {
EnableBothScriptContexts(); ScriptContext_Enable();
data[0] = 3; data[0] = 3;
} }
break; break;
@ -283,7 +283,7 @@ static void sub_80816A8(u8 taskId)
REG_BLDALPHA = data[8]; REG_BLDALPHA = data[8];
REG_WININ = data[9]; REG_WININ = data[9];
REG_WINOUT = data[10]; REG_WINOUT = data[10];
EnableBothScriptContexts(); ScriptContext_Enable();
DestroyTask(taskId); DestroyTask(taskId);
break; break;
} }
@ -337,6 +337,6 @@ static void task50_0807F0C8(u8 taskId)
if (BGMusicStopped() == TRUE) if (BGMusicStopped() == TRUE)
{ {
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
} }

6
src/field_special_scene.c
View File

@ -247,7 +247,7 @@ void Task_HandleTruckSequence(u8 taskId)
DrawWholeMapView(); DrawWholeMapView();
PlaySE(SE_TRUCK_DOOR); PlaySE(SE_TRUCK_DOOR);
DestroyTask(taskId); DestroyTask(taskId);
ScriptContext2_Disable(); UnlockPlayerFieldControls();
} }
break; break;
} }
@ -259,7 +259,7 @@ void ExecuteTruckSequence(void)
MapGridSetMetatileIdAt(11, 9, METATILE_ID(InsideOfTruck, DoorClosedFloor_Mid)); MapGridSetMetatileIdAt(11, 9, METATILE_ID(InsideOfTruck, DoorClosedFloor_Mid));
MapGridSetMetatileIdAt(11, 10, METATILE_ID(InsideOfTruck, DoorClosedFloor_Bottom)); MapGridSetMetatileIdAt(11, 10, METATILE_ID(InsideOfTruck, DoorClosedFloor_Bottom));
DrawWholeMapView(); DrawWholeMapView();
ScriptContext2_Enable(); LockPlayerFieldControls();
CpuFastFill(0, gPlttBufferFaded, 0x400); CpuFastFill(0, gPlttBufferFaded, 0x400);
CreateTask(Task_HandleTruckSequence, 0xA); CreateTask(Task_HandleTruckSequence, 0xA);
} }
@ -370,7 +370,7 @@ void sub_80C791C(void)
gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
pal_fill_black(); pal_fill_black();
CreateTask(Task_HandlePorthole, 80); CreateTask(Task_HandlePorthole, 80);
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
void sub_80C7958(void) void sub_80C7958(void)

14
src/field_specials.c
View File

@ -70,14 +70,14 @@ static struct ElevatorMenu gUnknown_03000760[20];
void ScrSpecial_ShowDiploma(void) void ScrSpecial_ShowDiploma(void)
{ {
SetMainCallback2(CB2_ShowDiploma); SetMainCallback2(CB2_ShowDiploma);
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
void ScrSpecial_ViewWallClock(void) void ScrSpecial_ViewWallClock(void)
{ {
gMain.savedCallback = CB2_ReturnToField; gMain.savedCallback = CB2_ReturnToField;
SetMainCallback2(CB2_ViewWallClock); SetMainCallback2(CB2_ViewWallClock);
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
void ResetCyclingRoadChallengeData(void) void ResetCyclingRoadChallengeData(void)
@ -585,7 +585,7 @@ static void Task_SlideOpenPetalburgGymDoors(u8 taskId)
if ((++gPetalburgGymSlidingDoorIndex) == 5) if ((++gPetalburgGymSlidingDoorIndex) == 5)
{ {
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
} }
else else
@ -1073,7 +1073,7 @@ void ScriptShowElevatorMenu(void)
static void sub_810E874(void) static void sub_810E874(void)
{ {
u8 i; u8 i;
ScriptContext2_Enable(); LockPlayerFieldControls();
if (gUnknown_0203925A > 5) if (gUnknown_0203925A > 5)
{ {
Menu_DrawStdWindowFrame(0, 0, 8, 11); Menu_DrawStdWindowFrame(0, 0, 8, 11);
@ -1257,7 +1257,7 @@ void sub_810EC34(u8 taskId)
void sub_810EC9C(u8 taskId) void sub_810EC9C(u8 taskId)
{ {
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
void sub_810ECB0(void) void sub_810ECB0(void)
@ -1456,7 +1456,7 @@ void GlassWorkshopUpdateScrollIndicators(u8, u8);
void ShowGlassWorkshopMenu(void) void ShowGlassWorkshopMenu(void)
{ {
u8 i; u8 i;
ScriptContext2_Enable(); LockPlayerFieldControls();
Menu_DrawStdWindowFrame(0, 0, 10, 11); Menu_DrawStdWindowFrame(0, 0, 10, 11);
InitMenu(0, 1, 1, 5, 0, 9); InitMenu(0, 1, 1, 5, 0, 9);
gUnknown_0203925C = 0; gUnknown_0203925C = 0;
@ -1830,7 +1830,7 @@ static void sub_810F7A8(u8 taskId)
static void sub_810F814(u8 taskId) static void sub_810F814(u8 taskId)
{ {
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
bool8 FoundBlackGlasses(void) bool8 FoundBlackGlasses(void)

2
src/field_tasks.c
View File

@ -73,7 +73,7 @@ void Task_RunTimeBasedEvents(u8 taskId)
{ {
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
if (!ScriptContext2_IsEnabled()) if (!ArePlayerFieldControlsLocked())
{ {
RunTimeBasedEvents(data); RunTimeBasedEvents(data);
UpdateAmbientCry(&tAmbientCryState, &tAmbientCryDelay); UpdateAmbientCry(&tAmbientCryState, &tAmbientCryDelay);

2
src/field_weather_effects.c
View File

@ -342,7 +342,7 @@ void task50_0807B6D4(u8 taskId)
task->tState++; task->tState++;
break; break;
case 4: case 4:
EnableBothScriptContexts(); ScriptContext_Enable();
DestroyTask(taskId); DestroyTask(taskId);
break; break;
} }

2
src/fldeff_berrytree.c
View File

@ -48,7 +48,7 @@ static void Task_WateringBerryTreeAnim_3(u8 taskId)
{ {
SetPlayerAvatarTransitionFlags(sub_80597D0()); SetPlayerAvatarTransitionFlags(sub_80597D0());
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
void DoWateringBerryTreeAnim(void) void DoWateringBerryTreeAnim(void)

8
src/fldeff_cut.c
View File

@ -120,7 +120,7 @@ void Debug_SetUpFieldMove_Cut(void)
} }
} }
ScriptContext2_Disable(); UnlockPlayerFieldControls();
} }
#endif #endif
@ -186,7 +186,7 @@ bool8 FldEff_UseCutOnGrass(void)
static void FieldCallback_CutTree(void) static void FieldCallback_CutTree(void)
{ {
gFieldEffectArguments[0] = gLastFieldPokeMenuOpened; gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
ScriptContext1_SetupScript(DoCutFieldEffectScript); ScriptContext_SetupScript(DoCutFieldEffectScript);
} }
bool8 FldEff_UseCutOnTree(void) bool8 FldEff_UseCutOnTree(void)
@ -378,12 +378,12 @@ static void CutGrassSpriteCallbackEnd(struct Sprite *sprite)
DestroySprite(&gSprites[eCutGrassSpriteArray[i]]); DestroySprite(&gSprites[eCutGrassSpriteArray[i]]);
FieldEffectStop(&gSprites[eCutGrassSpriteArray[0]], FLDEFF_CUT_GRASS); FieldEffectStop(&gSprites[eCutGrassSpriteArray[0]], FLDEFF_CUT_GRASS);
ScriptUnfreezeObjectEvents(); ScriptUnfreezeObjectEvents();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
} }
static void StartCutTreeFieldEffect(void) static void StartCutTreeFieldEffect(void)
{ {
PlaySE(SE_M_CUT); PlaySE(SE_M_CUT);
FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_TREE); FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_TREE);
EnableBothScriptContexts(); ScriptContext_Enable();
} }

4
src/fldeff_decoration.c
View File

@ -256,7 +256,7 @@ bool8 FldEff_SandPillar(void)
{ {
s16 x, y; s16 x, y;
ScriptContext2_Enable(); LockPlayerFieldControls();
GetXYCoordsOneStepInFrontOfPlayer(&x, &y); GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
gFieldEffectArguments[5] = x; gFieldEffectArguments[5] = x;
gFieldEffectArguments[6] = y; gFieldEffectArguments[6] = y;
@ -328,7 +328,7 @@ void SpriteCB_SandPillar_1(struct Sprite *sprite)
void SpriteCB_SandPillar_2(struct Sprite *sprite) void SpriteCB_SandPillar_2(struct Sprite *sprite)
{ {
FieldEffectStop(sprite, FLDEFF_SAND_PILLAR); FieldEffectStop(sprite, FLDEFF_SAND_PILLAR);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
void GetShieldToyTVDecorationInfo(void) void GetShieldToyTVDecorationInfo(void)

4
src/fldeff_flash.c
View File

@ -79,7 +79,7 @@ void debug_sub_8122080(void)
if (gMapHeader.cave == 1 && !FlagGet(FLAG_SYS_USE_FLASH)) if (gMapHeader.cave == 1 && !FlagGet(FLAG_SYS_USE_FLASH))
sub_810CBFC(); sub_810CBFC();
else else
ScriptContext2_Disable(); UnlockPlayerFieldControls();
} }
#endif #endif
@ -108,7 +108,7 @@ static void sub_810CC34(void)
{ {
PlaySE(SE_M_REFLECT); PlaySE(SE_M_REFLECT);
FlagSet(FLAG_SYS_USE_FLASH); FlagSet(FLAG_SYS_USE_FLASH);
ScriptContext1_SetupScript(gUnknown_081B694A); ScriptContext_SetupScript(gUnknown_081B694A);
} }
void sub_810CC54(void) void sub_810CC54(void)

2
src/fldeff_secret_base_pc.c
View File

@ -46,7 +46,7 @@ static void Task_SecretBasePCTurnOn(u8 taskId)
MapGridSetMetatileIdAt(data[0], data[1], 548); MapGridSetMetatileIdAt(data[0], data[1], 548);
CurrentMapDrawMetatileAt(data[0], data[1]); CurrentMapDrawMetatileAt(data[0], data[1]);
FieldEffectActiveListRemove(FLDEFF_SECRET_BASE_PC_TURN_ON); FieldEffectActiveListRemove(FLDEFF_SECRET_BASE_PC_TURN_ON);
EnableBothScriptContexts(); ScriptContext_Enable();
DestroyTask(taskId); DestroyTask(taskId);
return; return;
} }

16
src/fldeff_secretpower.c
View File

@ -255,7 +255,7 @@ void Debug_SetUpFieldMove_SecretPower(void)
if (gSpecialVar_Result == 1 || GetPlayerFacingDirection() != DIR_NORTH) if (gSpecialVar_Result == 1 || GetPlayerFacingDirection() != DIR_NORTH)
{ {
ScriptContext2_Disable(); UnlockPlayerFieldControls();
return; return;
} }
@ -281,7 +281,7 @@ void Debug_SetUpFieldMove_SecretPower(void)
} }
else else
{ {
ScriptContext2_Disable(); UnlockPlayerFieldControls();
} }
} }
@ -328,7 +328,7 @@ bool8 SetUpFieldMove_SecretPower(void)
static void FieldCallback_SecretBaseCave(void) static void FieldCallback_SecretBaseCave(void)
{ {
gFieldEffectArguments[0] = gLastFieldPokeMenuOpened; gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
ScriptContext1_SetupScript(DoSecretBaseCaveFieldEffectScript); ScriptContext_SetupScript(DoSecretBaseCaveFieldEffectScript);
} }
bool8 FldEff_UseSecretPowerCave(void) bool8 FldEff_UseSecretPowerCave(void)
@ -383,13 +383,13 @@ static void CaveEntranceSpriteCallback2(struct Sprite *sprite)
static void CaveEntranceSpriteCallbackEnd(struct Sprite *sprite) static void CaveEntranceSpriteCallbackEnd(struct Sprite *sprite)
{ {
FieldEffectStop(sprite, FLDEFF_SECRET_POWER_CAVE); FieldEffectStop(sprite, FLDEFF_SECRET_POWER_CAVE);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
static void FieldCallback_SecretBaseTree(void) static void FieldCallback_SecretBaseTree(void)
{ {
gFieldEffectArguments[0] = gLastFieldPokeMenuOpened; gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
ScriptContext1_SetupScript(DoSecretBaseTreeFieldEffectScript); ScriptContext_SetupScript(DoSecretBaseTreeFieldEffectScript);
} }
bool8 FldEff_UseSecretPowerTree(void) bool8 FldEff_UseSecretPowerTree(void)
@ -456,13 +456,13 @@ static void TreeEntranceSpriteCallback2(struct Sprite *sprite)
static void TreeEntranceSpriteCallbackEnd(struct Sprite *sprite) static void TreeEntranceSpriteCallbackEnd(struct Sprite *sprite)
{ {
FieldEffectStop(sprite, FLDEFF_SECRET_POWER_TREE); FieldEffectStop(sprite, FLDEFF_SECRET_POWER_TREE);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
static void FieldCallback_SecretBaseShrub(void) static void FieldCallback_SecretBaseShrub(void)
{ {
gFieldEffectArguments[0] = gLastFieldPokeMenuOpened; gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
ScriptContext1_SetupScript(DoSecretBaseShrubFieldEffectScript); ScriptContext_SetupScript(DoSecretBaseShrubFieldEffectScript);
} }
bool8 FldEff_UseSecretPowerShrub(void) bool8 FldEff_UseSecretPowerShrub(void)
@ -517,5 +517,5 @@ static void ShrubEntranceSpriteCallback2(struct Sprite *sprite)
static void ShrubEntranceSpriteCallbackEnd(struct Sprite *sprite) static void ShrubEntranceSpriteCallbackEnd(struct Sprite *sprite)
{ {
FieldEffectStop(sprite, FLDEFF_SECRET_POWER_SHRUB); FieldEffectStop(sprite, FLDEFF_SECRET_POWER_SHRUB);
EnableBothScriptContexts(); ScriptContext_Enable();
} }

6
src/fldeff_strength.c
View File

@ -39,7 +39,7 @@ void debug_sub_8130318(void)
} }
else else
{ {
ScriptContext2_Disable(); UnlockPlayerFieldControls();
} }
} }
#endif #endif
@ -67,7 +67,7 @@ bool8 SetUpFieldMove_Strength(void)
static void sub_811AA18(void) static void sub_811AA18(void)
{ {
gFieldEffectArguments[0] = gLastFieldPokeMenuOpened; gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
ScriptContext1_SetupScript(S_UseStrength); ScriptContext_SetupScript(S_UseStrength);
} }
static void sub_811AA38(void) static void sub_811AA38(void)
@ -95,6 +95,6 @@ static void sub_811AA9C(void)
else else
{ {
FieldEffectActiveListRemove(40); FieldEffectActiveListRemove(40);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
} }

2
src/fldeff_sweetscent.c
View File

@ -84,7 +84,7 @@ static void FailSweetScentEncounter(u8 taskId)
{ {
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
ScriptContext1_SetupScript(SweetScentNothingHereScript); ScriptContext_SetupScript(SweetScentNothingHereScript);
DestroyTask(taskId); DestroyTask(taskId);
} }
} }

4
src/hof_pc.c
View File

@ -15,7 +15,7 @@ static void Task_WaitForPaletteFade(u8);
void AccessHallOfFamePC(void) void AccessHallOfFamePC(void)
{ {
SetMainCallback2(sub_81428CC); SetMainCallback2(sub_81428CC);
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
void ReturnFromHallOfFamePC(void) void ReturnFromHallOfFamePC(void)
@ -26,7 +26,7 @@ void ReturnFromHallOfFamePC(void)
static void ReshowPCMenuAfterHallOfFamePC(void) static void ReshowPCMenuAfterHallOfFamePC(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
Overworld_PlaySpecialMapMusic(); Overworld_PlaySpecialMapMusic();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0));
ScriptMenu_CreatePCMultichoice(); ScriptMenu_CreatePCMultichoice();

6
src/item_menu.c
View File

@ -2124,7 +2124,7 @@ void CleanUpOverworldMessage(u8 taskId)
Menu_EraseWindowRect(0, 13, 29, 19); Menu_EraseWindowRect(0, 13, 29, 19);
DestroyTask(taskId); DestroyTask(taskId);
ScriptUnfreezeObjectEvents(); ScriptUnfreezeObjectEvents();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
} }
void ExecuteItemUseFromBlackPalette(void) void ExecuteItemUseFromBlackPalette(void)
@ -2745,7 +2745,7 @@ bool32 UseRegisteredKeyItem(void)
{ {
u8 taskId; u8 taskId;
ScriptContext2_Enable(); LockPlayerFieldControls();
FreezeObjectEvents(); FreezeObjectEvents();
sub_80594C0(); sub_80594C0();
sub_80597F4(); sub_80597F4();
@ -2756,7 +2756,7 @@ bool32 UseRegisteredKeyItem(void)
} }
gSaveBlock1.registeredItem = 0; gSaveBlock1.registeredItem = 0;
} }
ScriptContext1_SetupScript(Event_NoRegisteredItem); ScriptContext_SetupScript(Event_NoRegisteredItem);
return TRUE; return TRUE;
} }

12
src/item_use.c
View File

@ -215,7 +215,7 @@ void ItemUseOnFieldCB_Bike(u8 taskId)
GetOnOffBike(PLAYER_AVATAR_FLAG_ACRO_BIKE); GetOnOffBike(PLAYER_AVATAR_FLAG_ACRO_BIKE);
ScriptUnfreezeObjectEvents(); ScriptUnfreezeObjectEvents();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskId); DestroyTask(taskId);
} }
@ -323,7 +323,7 @@ void ExitItemfinder(u8 taskId)
{ {
Menu_EraseWindowRect(0, 14, 29, 19); Menu_EraseWindowRect(0, 14, 29, 19);
ScriptUnfreezeObjectEvents(); ScriptUnfreezeObjectEvents();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskId); DestroyTask(taskId);
} }
@ -659,8 +659,8 @@ void ItemUseOutOfBattle_Berry(u8 taskId)
static void ItemUseOnFieldCB_Berry(u8 taskId) static void ItemUseOnFieldCB_Berry(u8 taskId)
{ {
RemoveBagItem(gSpecialVar_ItemId, 1); RemoveBagItem(gSpecialVar_ItemId, 1);
ScriptContext2_Enable(); LockPlayerFieldControls();
ScriptContext1_SetupScript(S_PlantBerryTreeFromBag); ScriptContext_SetupScript(S_PlantBerryTreeFromBag);
DestroyTask(taskId); DestroyTask(taskId);
} }
@ -679,8 +679,8 @@ void ItemUseOutOfBattle_WailmerPail(u8 taskId)
static void ItemUseOnFieldCB_WailmerPail(u8 taskId) static void ItemUseOnFieldCB_WailmerPail(u8 taskId)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
ScriptContext1_SetupScript(S_WaterBerryTreeFromBag); ScriptContext_SetupScript(S_WaterBerryTreeFromBag);
DestroyTask(taskId); DestroyTask(taskId);
} }

4
src/mail.c
View File

@ -810,8 +810,8 @@ void debug_sub_810CCEC(u8 taskId)
u8 debug_sub_810CD9C(void) u8 debug_sub_810CD9C(void)
{ {
CloseMenu(); CloseMenu();
ScriptContext1_Stop(); ScriptContext_Stop();
ScriptContext2_Enable(); LockPlayerFieldControls();
gUnknown_Debug_0300079C = 0; gUnknown_Debug_0300079C = 0;
gSpecialVar_0x8004 = gSpecialVar_0x8005 = gSpecialVar_0x8006 = 0; gSpecialVar_0x8004 = gSpecialVar_0x8005 = gSpecialVar_0x8006 = 0;
SetMainCallback2(debug_sub_810D388); SetMainCallback2(debug_sub_810D388);

6
src/mauville_man.c
View File

@ -378,7 +378,7 @@ void ScrSpecial_PlayBardSong(void)
{ {
StartBardSong(gSpecialVar_0x8004); StartBardSong(gSpecialVar_0x8004);
Menu_DisplayDialogueFrame(); Menu_DisplayDialogueFrame();
ScriptContext1_Stop(); ScriptContext_Stop();
} }
void ScrSpecial_GetHipsterSpokenFlag(void) void ScrSpecial_GetHipsterSpokenFlag(void)
@ -747,7 +747,7 @@ static void Task_BardSong(u8 taskId)
{ {
FadeInNewBGM(MUS_POKE_CENTER, 6); FadeInNewBGM(MUS_POKE_CENTER, 6);
m4aMPlayFadeOutTemporarily(&gMPlayInfo_SE2, 2); m4aMPlayFadeOutTemporarily(&gMPlayInfo_SE2, 2);
EnableBothScriptContexts(); ScriptContext_Enable();
DestroyTask(taskId); DestroyTask(taskId);
} }
else if (gStringVar4[task->tCharIndex] == CHAR_SPACE) else if (gStringVar4[task->tCharIndex] == CHAR_SPACE)
@ -1093,7 +1093,7 @@ static void Task_StoryListMenu(u8 taskId)
Menu_DestroyCursor(); Menu_DestroyCursor();
Menu_EraseWindowRect(0, 0, 25, 12); Menu_EraseWindowRect(0, 0, 25, 12);
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); ScriptContext_Enable();
break; break;
} }
} }

2
src/menu.c
View File

@ -55,7 +55,7 @@ void CloseMenu(void)
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
Menu_EraseScreen(); Menu_EraseScreen();
ScriptUnfreezeObjectEvents(); ScriptUnfreezeObjectEvents();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
Menu_DestroyCursor(); Menu_DestroyCursor();
} }

2
src/move_tutor_menu.c
View File

@ -239,7 +239,7 @@ static void VBlankCB_MoveTutorMenu(void)
void DisplayMoveTutorMenu(void) void DisplayMoveTutorMenu(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
CreateTask(InitMoveTutorMenuWaitFade, 10); CreateTask(InitMoveTutorMenuWaitFade, 10);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
} }

44
src/mystery_event_msg.c
View File

@ -2,50 +2,50 @@
#if ENGLISH #if ENGLISH
const u8 gOtherText_BerryObtainedDadHasIt[] = _("Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM."); const u8 gText_MysteryEventBerry[] = _("Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM.");
const u8 gOtherText_BerryTransformed[] = _("The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY."); const u8 gText_MysteryEventBerryTransform[] = _("The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY.");
const u8 gOtherText_BerryAlreadyObtained[] = _("The {STR_VAR_1} BERRY has already been\nobtained."); const u8 gText_MysteryEventBerryObtained[] = _("The {STR_VAR_1} BERRY has already been\nobtained.");
const u8 gOtherText_SpecialRibbonReceived[] = _("A special RIBBON was awarded to your\nparty POKéMON."); const u8 gText_MysteryEventSpecialRibbon[] = _("A special RIBBON was awarded to your\nparty POKéMON.");
const u8 gOtherText_DexUpgraded[] = _("The POKéDEX has been upgraded with\nthe NATIONAL MODE."); const u8 gText_MysteryEventNationalDex[] = _("The POKéDEX has been upgraded with\nthe NATIONAL MODE.");
const u8 gOtherText_RareWordAdded[] = _("A rare word has been added."); const u8 gText_MysteryEventRareWord[] = _("A rare word has been added.");
const u8 gOtherText_PokeWasSentOver[] = _("{STR_VAR_1} was sent over!"); const u8 gText_MysteryEventSentOver[] = _("{STR_VAR_1} was sent over!");
const u8 gOtherText_PartyIsFull[] = _("Your party is full.\n{STR_VAR_1} could not be sent over."); const u8 gText_MysteryEventFullParty[] = _("Your party is full.\n{STR_VAR_1} could not be sent over.");
const u8 gOtherText_NewTrainerInHoenn[] = _("A new TRAINER has arrived in HOENN."); const u8 gText_MysteryEventNewTrainer[] = _("A new TRAINER has arrived in HOENN.");
const u8 gOtherText_NewAdversaryInBattleTower[] = _("A new adversary has arrived in the\nBATTLE TOWER."); const u8 gText_MysteryEventNewAdversaryInBattleTower[] = _("A new adversary has arrived in the\nBATTLE TOWER.");
const u8 gOtherText_DataCannotUseVersion[] = _("This data cannot be used in\nthis version."); const u8 gText_MysteryEventCantBeUsed[] = _("This data cannot be used in\nthis version.");
#elif GERMAN #elif GERMAN
const u8 gOtherText_BerryObtainedDadHasIt[] = _("Eine {STR_VAR_2}BEERE! Vater in der \nARENA von BLÜTENBURG CITY besitzt\lauch eine."); const u8 gText_MysteryEventBerry[] = _("Eine {STR_VAR_2}BEERE! Vater in der \nARENA von BLÜTENBURG CITY besitzt\lauch eine.");
const u8 gOtherText_BerryTransformed[] = _("Die {STR_VAR_1}BEERE verwandelte\nsich in eine {STR_VAR_2}BEERE!"); const u8 gText_MysteryEventBerryTransform[] = _("Die {STR_VAR_1}BEERE verwandelte\nsich in eine {STR_VAR_2}BEERE!");
const u8 gOtherText_BerryAlreadyObtained[] = _("Du hast schon eine {STR_VAR_1}BEERE."); const u8 gText_MysteryEventBerryObtained[] = _("Du hast schon eine {STR_VAR_1}BEERE.");
const u8 gOtherText_SpecialRibbonReceived[] = _("Ein besonderes BAND wurde deinem\nPOKéMON im Team verliehen."); const u8 gText_MysteryEventSpecialRibbon[] = _("Ein besonderes BAND wurde deinem\nPOKéMON im Team verliehen.");
const u8 gOtherText_DexUpgraded[] = _("Der POKéDEX wurde mit dem NATIONALEN\nMODUS ausgerüstet."); const u8 gText_MysteryEventNationalDex[] = _("Der POKéDEX wurde mit dem NATIONALEN\nMODUS ausgerüstet.");
const u8 gOtherText_RareWordAdded[] = _("Ein seltenes Wort wurde hinzugefügt."); const u8 gText_MysteryEventRareWord[] = _("Ein seltenes Wort wurde hinzugefügt.");
const u8 gOtherText_PokeWasSentOver[] = _("{STR_VAR_1} wurde gesendet!"); const u8 gText_MysteryEventSentOver[] = _("{STR_VAR_1} wurde gesendet!");
const u8 gOtherText_PartyIsFull[] = _("Dein Team ist bereits vollständig.\n{STR_VAR_1} kann nicht gesendet\lwerden."); const u8 gText_MysteryEventFullParty[] = _("Dein Team ist bereits vollständig.\n{STR_VAR_1} kann nicht gesendet\lwerden.");
const u8 gOtherText_NewTrainerInHoenn[] = _("Ein neuer TRAINER ist in HOENN\nangekommen."); const u8 gText_MysteryEventNewTrainer[] = _("Ein neuer TRAINER ist in HOENN\nangekommen.");
const u8 gOtherText_NewAdversaryInBattleTower[] = _("Ein neuer Widersacher ist im DUELLTURM\neingetroffen."); const u8 gText_MysteryEventNewAdversaryInBattleTower[] = _("Ein neuer Widersacher ist im DUELLTURM\neingetroffen.");
const u8 gOtherText_DataCannotUseVersion[] = _("Die Daten können in dieser Edition\nnicht eingesetzt werden."); const u8 gText_MysteryEventCantBeUsed[] = _("Die Daten können in dieser Edition\nnicht eingesetzt werden.");
#endif // ENGLISH/GERMAN #endif // ENGLISH/GERMAN

218
src/mystery_event_script.c
View File

@ -9,44 +9,52 @@
#include "pokemon.h" #include "pokemon.h"
#include "pokemon_size_record.h" #include "pokemon_size_record.h"
#include "script.h" #include "script.h"
#include "constants/species.h"
#include "strings.h" #include "strings.h"
#include "string_util.h" #include "string_util.h"
#include "text.h" #include "text.h"
#include "util.h" #include "util.h"
#include "mystery_event_msg.h" #include "mystery_event_msg.h"
#include "pokemon_storage_system.h"
#if ENGLISH #include "constants/berry.h"
#define LANGUAGE_MASK 0x2 #include "constants/species.h"
#elif GERMAN
#define LANGUAGE_MASK 0x4
#endif
#ifdef SAPPHIRE
#define VERSION_MASK 0x100
#else
#define VERSION_MASK 0x80
#endif
extern void party_compaction(void);
extern ScrCmdFunc gMysteryEventScriptCmdTable[]; extern ScrCmdFunc gMysteryEventScriptCmdTable[];
extern ScrCmdFunc gMysteryEventScriptCmdTableEnd[]; extern ScrCmdFunc gMysteryEventScriptCmdTableEnd[];
// 0x1 in English FRLG, 0x1 in English Emerald
#if ENGLISH
#define LANGUAGE_MASK (1 << 1)
#elif GERMAN
#define LANGUAGE_MASK (1 << 2)
#endif
// 0x1 in FireRed, 0x2 in LeafGreen, 0x200 in Emerald
#ifdef SAPPHIRE
#define VERSION_MASK (1 << 8)
#else
#define VERSION_MASK (1 << 7)
#endif
#define mScriptBase data[0]
#define mOffset data[1]
#define mStatus data[2]
#define mValid data[3]
static EWRAM_DATA struct ScriptContext sMysteryEventScriptContext = {0}; static EWRAM_DATA struct ScriptContext sMysteryEventScriptContext = {0};
static bool32 CheckCompatibility(u16 a1, u32 a2, u16 a3, u32 a4) static bool32 CheckCompatibility(u16 unk0, u32 unk1, u16 unk2, u32 version)
{ {
if (!(a1 & LANGUAGE_MASK)) if (!(unk0 & LANGUAGE_MASK))
return FALSE; return FALSE;
if (!(a2 & LANGUAGE_MASK)) if (!(unk1 & LANGUAGE_MASK))
return FALSE; return FALSE;
if (!(a3 & 0x4)) // 0x1 in FRLG, 0x4 in Emerald
if (!(unk2 & 0x4))
return FALSE; return FALSE;
if (!(a4 & VERSION_MASK)) if (!(version & VERSION_MASK))
return FALSE; return FALSE;
return TRUE; return TRUE;
@ -54,23 +62,23 @@ static bool32 CheckCompatibility(u16 a1, u32 a2, u16 a3, u32 a4)
static void SetIncompatible(void) static void SetIncompatible(void)
{ {
StringExpandPlaceholders(gStringVar4, gOtherText_DataCannotUseVersion); StringExpandPlaceholders(gStringVar4, gText_MysteryEventCantBeUsed);
SetMysteryEventScriptStatus(3); SetMysteryEventScriptStatus(MEVENT_STATUS_FAILURE);
} }
static void InitMysteryEventScript(struct ScriptContext *ctx, u8 *script) static void InitMysteryEventScript(struct ScriptContext *ctx, u8 *script)
{ {
InitScriptContext(ctx, gMysteryEventScriptCmdTable, gMysteryEventScriptCmdTableEnd); InitScriptContext(ctx, gMysteryEventScriptCmdTable, gMysteryEventScriptCmdTableEnd);
SetupBytecodeScript(ctx, script); SetupBytecodeScript(ctx, script);
ctx->data[0] = (u32)script; ctx->mScriptBase = (u32)script;
ctx->data[1] = 0; ctx->mOffset = 0;
ctx->data[2] = 0; ctx->mStatus = MEVENT_STATUS_LOAD_OK;
ctx->data[3] = 0; ctx->mValid = FALSE;
} }
static bool32 RunMysteryEventScriptCommand(struct ScriptContext *ctx) static bool32 RunMysteryEventScriptCommand(struct ScriptContext *ctx)
{ {
if (RunScriptCommand(ctx) && ctx->data[3]) if (RunScriptCommand(ctx) && ctx->mValid)
return TRUE; return TRUE;
else else
return FALSE; return FALSE;
@ -80,14 +88,14 @@ u32 RunMysteryEventScript(u8 *script)
{ {
struct ScriptContext *ctx = &sMysteryEventScriptContext; struct ScriptContext *ctx = &sMysteryEventScriptContext;
InitMysteryEventScript(ctx, script); InitMysteryEventScript(ctx, script);
while (RunMysteryEventScriptCommand(ctx)) while (RunMysteryEventScriptCommand(ctx));
;
return ctx->data[2]; return ctx->mStatus;
} }
void SetMysteryEventScriptStatus(u32 val) void SetMysteryEventScriptStatus(u32 status)
{ {
sMysteryEventScriptContext.data[2] = val; sMysteryEventScriptContext.mStatus = status;
} }
static int CalcChecksum(u8 *data, int size) static int CalcChecksum(u8 *data, int size)
@ -161,25 +169,16 @@ static u32 CalcRecordMixingGiftChecksum(void)
static bool32 IsRecordMixingGiftValid(void) static bool32 IsRecordMixingGiftValid(void)
{ {
struct RecordMixingGiftData *data = &gSaveBlock1.recordMixingGift.data; struct RecordMixingGiftData *data = &gSaveBlock1.recordMixingGift.data;
u32 checksum = CalcRecordMixingGiftChecksum(); u32 checksum = CalcRecordMixingGiftChecksum();
if (!data->unk0) if (data->unk0 == 0
|| data->quantity == 0
|| data->itemId == 0
|| checksum == 0
|| checksum != gSaveBlock1.recordMixingGift.checksum)
return FALSE; return FALSE;
if (!data->quantity)
return FALSE;
if (!data->itemId)
return FALSE;
if (checksum == 0)
return FALSE;
if (checksum == gSaveBlock1.recordMixingGift.checksum)
return TRUE;
else else
return FALSE; return TRUE;
} }
static void ClearRecordMixingGift(void) static void ClearRecordMixingGift(void)
@ -219,6 +218,7 @@ u16 GetRecordMixingGift(void)
ClearRecordMixingGift(); ClearRecordMixingGift();
else else
gSaveBlock1.recordMixingGift.checksum = CalcRecordMixingGiftChecksum(); gSaveBlock1.recordMixingGift.checksum = CalcRecordMixingGiftChecksum();
return itemId; return itemId;
} }
} }
@ -231,19 +231,19 @@ bool8 MEScrCmd_end(struct ScriptContext *ctx)
bool8 MEScrCmd_checkcompat(struct ScriptContext *ctx) bool8 MEScrCmd_checkcompat(struct ScriptContext *ctx)
{ {
u16 v1; u16 unk0;
u32 v2; u32 unk1;
u16 v3; u16 unk2;
u32 v4; u32 version;
ctx->data[1] = ScriptReadWord(ctx); ctx->mOffset = ScriptReadWord(ctx);
v1 = ScriptReadHalfword(ctx); unk0 = ScriptReadHalfword(ctx);
v2 = ScriptReadWord(ctx); unk1 = ScriptReadWord(ctx);
v3 = ScriptReadHalfword(ctx); unk2 = ScriptReadHalfword(ctx);
v4 = ScriptReadWord(ctx); version = ScriptReadWord(ctx);
if (CheckCompatibility(v1, v2, v3, v4) == TRUE) if (CheckCompatibility(unk0, unk1, unk2, version) == TRUE)
ctx->data[3] = 1; ctx->mValid = TRUE;
else else
SetIncompatible(); SetIncompatible();
@ -257,24 +257,24 @@ bool8 MEScrCmd_nop(struct ScriptContext *ctx)
bool8 MEScrCmd_setstatus(struct ScriptContext *ctx) bool8 MEScrCmd_setstatus(struct ScriptContext *ctx)
{ {
u8 value = ScriptReadByte(ctx); u8 status = ScriptReadByte(ctx);
ctx->data[2] = value; ctx->mStatus = status;
return FALSE; return FALSE;
} }
bool8 MEScrCmd_setmsg(struct ScriptContext *ctx) bool8 MEScrCmd_setmsg(struct ScriptContext *ctx)
{ {
u8 value = ScriptReadByte(ctx); u8 status = ScriptReadByte(ctx);
u8 *str = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); u8 *str = (u8 *)(ScriptReadWord(ctx) - ctx->mOffset + ctx->mScriptBase);
if (value == 255 || value == ctx->data[2]) if (status == MEVENT_STATUS_FF || status == ctx->mStatus)
StringExpandPlaceholders(gStringVar4, str); StringExpandPlaceholders(gStringVar4, str);
return FALSE; return FALSE;
} }
bool8 MEScrCmd_runscript(struct ScriptContext *ctx) bool8 MEScrCmd_runscript(struct ScriptContext *ctx)
{ {
u8 *script = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); u8 *script = (u8 *)(ScriptReadWord(ctx) - ctx->mOffset + ctx->mScriptBase);
ScriptContext2_RunNewScript(script); RunScriptImmediately(script);
return FALSE; return FALSE;
} }
@ -283,35 +283,35 @@ bool8 MEScrCmd_setenigmaberry(struct ScriptContext *ctx)
u8 *str; u8 *str;
const u8 *message; const u8 *message;
bool32 haveBerry = IsEnigmaBerryValid(); bool32 haveBerry = IsEnigmaBerryValid();
u8 *berry = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); u8 *berry = (u8 *)(ScriptReadWord(ctx) - ctx->mOffset + ctx->mScriptBase);
StringCopyN(gStringVar1, gSaveBlock1.enigmaBerry.berry.name, 7); StringCopyN(gStringVar1, gSaveBlock1.enigmaBerry.berry.name, BERRY_NAME_LENGTH + 1);
SetEnigmaBerry(berry); SetEnigmaBerry(berry);
StringCopyN(gStringVar2, gSaveBlock1.enigmaBerry.berry.name, 7); StringCopyN(gStringVar2, gSaveBlock1.enigmaBerry.berry.name, BERRY_NAME_LENGTH + 1);
if (!haveBerry) if (!haveBerry)
{ {
str = gStringVar4; str = gStringVar4;
message = gOtherText_BerryObtainedDadHasIt; message = gText_MysteryEventBerry;
} }
else if (StringCompare(gStringVar1, gStringVar2)) else if (StringCompare(gStringVar1, gStringVar2))
{ {
str = gStringVar4; str = gStringVar4;
message = gOtherText_BerryTransformed; message = gText_MysteryEventBerryTransform;
} }
else else
{ {
str = gStringVar4; str = gStringVar4;
message = gOtherText_BerryAlreadyObtained; message = gText_MysteryEventBerryObtained;
} }
StringExpandPlaceholders(str, message); StringExpandPlaceholders(str, message);
ctx->data[2] = 2; ctx->mStatus = MEVENT_STATUS_SUCCESS;
if (IsEnigmaBerryValid() == TRUE) if (IsEnigmaBerryValid() == TRUE)
VarSet(VAR_ENIGMA_BERRY_AVAILABLE, 1); VarSet(VAR_ENIGMA_BERRY_AVAILABLE, 1);
else else
ctx->data[2] = 1; ctx->mStatus = MEVENT_STATUS_LOAD_ERROR;
return FALSE; return FALSE;
} }
@ -321,8 +321,8 @@ bool8 MEScrCmd_giveribbon(struct ScriptContext *ctx)
u8 index = ScriptReadByte(ctx); u8 index = ScriptReadByte(ctx);
u8 ribbonId = ScriptReadByte(ctx); u8 ribbonId = ScriptReadByte(ctx);
GiveGiftRibbonToParty(index, ribbonId); GiveGiftRibbonToParty(index, ribbonId);
StringExpandPlaceholders(gStringVar4, gOtherText_SpecialRibbonReceived); StringExpandPlaceholders(gStringVar4, gText_MysteryEventSpecialRibbon);
ctx->data[2] = 2; ctx->mStatus = MEVENT_STATUS_SUCCESS;
return FALSE; return FALSE;
} }
@ -331,8 +331,8 @@ bool8 MEScrCmd_initramscript(struct ScriptContext *ctx)
u8 mapGroup = ScriptReadByte(ctx); u8 mapGroup = ScriptReadByte(ctx);
u8 mapNum = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx);
u8 objectId = ScriptReadByte(ctx); u8 objectId = ScriptReadByte(ctx);
u8 *script = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); u8 *script = (u8 *)(ScriptReadWord(ctx) - ctx->mOffset + ctx->mScriptBase);
u8 *scriptEnd = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); u8 *scriptEnd = (u8 *)(ScriptReadWord(ctx) - ctx->mOffset + ctx->mScriptBase);
InitRamScript(script, scriptEnd - script, mapGroup, mapNum, objectId); InitRamScript(script, scriptEnd - script, mapGroup, mapNum, objectId);
return FALSE; return FALSE;
} }
@ -340,16 +340,16 @@ bool8 MEScrCmd_initramscript(struct ScriptContext *ctx)
bool8 MEScrCmd_givenationaldex(struct ScriptContext *ctx) bool8 MEScrCmd_givenationaldex(struct ScriptContext *ctx)
{ {
EnableNationalPokedex(); EnableNationalPokedex();
StringExpandPlaceholders(gStringVar4, gOtherText_DexUpgraded); StringExpandPlaceholders(gStringVar4, gText_MysteryEventNationalDex);
ctx->data[2] = 2; ctx->mStatus = MEVENT_STATUS_SUCCESS;
return FALSE; return FALSE;
} }
bool8 MEScrCmd_addrareword(struct ScriptContext *ctx) bool8 MEScrCmd_addrareword(struct ScriptContext *ctx)
{ {
sub_80EB890(ScriptReadByte(ctx)); UnlockTrendySaying(ScriptReadByte(ctx));
StringExpandPlaceholders(gStringVar4, gOtherText_RareWordAdded); StringExpandPlaceholders(gStringVar4, gText_MysteryEventRareWord);
ctx->data[2] = 2; ctx->mStatus = MEVENT_STATUS_SUCCESS;
return FALSE; return FALSE;
} }
@ -368,7 +368,7 @@ bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx)
struct Pokemon pokemon; struct Pokemon pokemon;
u16 species; u16 species;
u16 heldItem; u16 heldItem;
u32 data = ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]; u32 data = ScriptReadWord(ctx) - ctx->mOffset + ctx->mScriptBase;
void *pokemonPtr = (void *)data; void *pokemonPtr = (void *)data;
void *mailPtr = (void *)(data + sizeof(struct Pokemon)); void *mailPtr = (void *)(data + sizeof(struct Pokemon));
@ -376,34 +376,34 @@ bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx)
species = GetMonData(&pokemon, MON_DATA_SPECIES2); species = GetMonData(&pokemon, MON_DATA_SPECIES2);
if (species == SPECIES_EGG) if (species == SPECIES_EGG)
StringCopyN(gStringVar1, gSystemText_Egg, 11); StringCopyN(gStringVar1, gText_EggNickname, POKEMON_NAME_LENGTH + 1);
else else
StringCopyN(gStringVar1, gSystemText_Pokemon2, 11); StringCopyN(gStringVar1, gText_Pokemon, POKEMON_NAME_LENGTH + 1);
if (gPlayerPartyCount == 6) if (gPlayerPartyCount == PARTY_SIZE)
{ {
StringExpandPlaceholders(gStringVar4, gOtherText_PartyIsFull); StringExpandPlaceholders(gStringVar4, gText_MysteryEventFullParty);
ctx->data[2] = 3; ctx->mStatus = MEVENT_STATUS_FAILURE;
} }
else else
{ {
memcpy(&gPlayerParty[5], pokemonPtr, sizeof(struct Pokemon)); memcpy(&gPlayerParty[PARTY_SIZE - 1], pokemonPtr, sizeof(struct Pokemon));
memcpy(&mail, mailPtr, sizeof(struct MailStruct)); memcpy(&mail, mailPtr, sizeof(struct MailStruct));
if (species != SPECIES_EGG) if (species != SPECIES_EGG)
{ {
u16 pokedexNum = SpeciesToNationalPokedexNum(species); u16 pokedexNum = SpeciesToNationalPokedexNum(species);
GetSetPokedexFlag(pokedexNum, 2); GetSetPokedexFlag(pokedexNum, FLAG_SET_SEEN);
GetSetPokedexFlag(pokedexNum, 3); GetSetPokedexFlag(pokedexNum, FLAG_SET_CAUGHT);
} }
heldItem = GetMonData(&gPlayerParty[5], MON_DATA_HELD_ITEM); heldItem = GetMonData(&gPlayerParty[PARTY_SIZE - 1], MON_DATA_HELD_ITEM);
if (ItemIsMail(heldItem)) if (ItemIsMail(heldItem))
GiveMailToMon2(&gPlayerParty[5], &mail); GiveMailToMon2(&gPlayerParty[PARTY_SIZE - 1], &mail);
party_compaction(); CompactPartySlots();
CalculatePlayerPartyCount(); CalculatePlayerPartyCount();
StringExpandPlaceholders(gStringVar4, gOtherText_PokeWasSentOver); StringExpandPlaceholders(gStringVar4, gText_MysteryEventSentOver);
ctx->data[2] = 2; ctx->mStatus = MEVENT_STATUS_SUCCESS;
} }
return FALSE; return FALSE;
@ -411,31 +411,31 @@ bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx)
bool8 MEScrCmd_addtrainer(struct ScriptContext *ctx) bool8 MEScrCmd_addtrainer(struct ScriptContext *ctx)
{ {
u32 data = ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]; u32 data = ScriptReadWord(ctx) - ctx->mOffset + ctx->mScriptBase;
memcpy(&gSaveBlock2.battleTower.ereaderTrainer, (void *)data, sizeof(gSaveBlock2.battleTower.ereaderTrainer)); memcpy(&gSaveBlock2.battleTower.ereaderTrainer, (void *)data, sizeof(gSaveBlock2.battleTower.ereaderTrainer));
ValidateEReaderTrainer(); ValidateEReaderTrainer();
StringExpandPlaceholders(gStringVar4, gOtherText_NewTrainerInHoenn); StringExpandPlaceholders(gStringVar4, gText_MysteryEventNewTrainer);
ctx->data[2] = 2; ctx->mStatus = MEVENT_STATUS_SUCCESS;
return FALSE; return FALSE;
} }
bool8 MEScrCmd_enableresetrtc(struct ScriptContext *ctx) bool8 MEScrCmd_enableresetrtc(struct ScriptContext *ctx)
{ {
EnableResetRTC(); EnableResetRTC();
StringExpandPlaceholders(gStringVar4, gSystemText_ClockAdjustmentUsable); StringExpandPlaceholders(gStringVar4, gText_InGameClockUsable);
ctx->data[2] = 2; ctx->mStatus = MEVENT_STATUS_SUCCESS;
return FALSE; return FALSE;
} }
bool8 MEScrCmd_checksum(struct ScriptContext *ctx) bool8 MEScrCmd_checksum(struct ScriptContext *ctx)
{ {
int checksum = ScriptReadWord(ctx); int checksum = ScriptReadWord(ctx);
u8 *data = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); u8 *data = (u8 *)(ScriptReadWord(ctx) - ctx->mOffset + ctx->mScriptBase);
u8 *dataEnd = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); u8 *dataEnd = (u8 *)(ScriptReadWord(ctx) - ctx->mOffset + ctx->mScriptBase);
if (checksum != CalcChecksum(data, dataEnd - data)) if (checksum != CalcChecksum(data, dataEnd - data))
{ {
ctx->data[3] = 0; ctx->mValid = FALSE;
ctx->data[2] = 1; ctx->mStatus = MEVENT_STATUS_LOAD_ERROR;
} }
return TRUE; return TRUE;
} }
@ -443,12 +443,12 @@ bool8 MEScrCmd_checksum(struct ScriptContext *ctx)
bool8 MEScrCmd_crc(struct ScriptContext *ctx) bool8 MEScrCmd_crc(struct ScriptContext *ctx)
{ {
int crc = ScriptReadWord(ctx); int crc = ScriptReadWord(ctx);
u8 *data = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); u8 *data = (u8 *)(ScriptReadWord(ctx) - ctx->mOffset + ctx->mScriptBase);
u8 *dataEnd = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); u8 *dataEnd = (u8 *)(ScriptReadWord(ctx) - ctx->mOffset + ctx->mScriptBase);
if (crc != CalcCRC16(data, dataEnd - data)) if (crc != CalcCRC16(data, dataEnd - data))
{ {
ctx->data[3] = 0; ctx->mValid = FALSE;
ctx->data[2] = 1; ctx->mStatus = MEVENT_STATUS_LOAD_ERROR;
} }
return TRUE; return TRUE;
} }

2
src/new_game.c
View File

@ -202,7 +202,7 @@ void NewGameInitData(void)
ResetFanClub(); ResetFanClub();
ResetLotteryCorner(); ResetLotteryCorner();
WarpToTruck(); WarpToTruck();
ScriptContext2_RunNewScript(EventScript_ResetAllMapFlags); RunScriptImmediately(EventScript_ResetAllMapFlags);
} }
#if DEBUG #if DEBUG

72
src/overworld.c
View File

@ -208,7 +208,7 @@ static void (*const gUnknown_082166D8[])(struct LinkPlayerObjectEvent *, struct
static void DoWhiteOut(void) static void DoWhiteOut(void)
{ {
ScriptContext2_RunNewScript(EventScript_WhiteOut); RunScriptImmediately(EventScript_WhiteOut);
gSaveBlock1.money /= 2; gSaveBlock1.money /= 2;
ScrSpecial_HealPlayerParty(); ScrSpecial_HealPlayerParty();
Overworld_ResetStateAfterWhiteOut(); Overworld_ResetStateAfterWhiteOut();
@ -234,7 +234,7 @@ void Overworld_ResetStateAfterTeleport(void)
FlagClear(FLAG_SYS_SAFARI_MODE); FlagClear(FLAG_SYS_SAFARI_MODE);
FlagClear(FLAG_SYS_USE_STRENGTH); FlagClear(FLAG_SYS_USE_STRENGTH);
FlagClear(FLAG_SYS_USE_FLASH); FlagClear(FLAG_SYS_USE_FLASH);
ScriptContext2_RunNewScript(EventScript_ResetMrBriney); RunScriptImmediately(EventScript_ResetMrBriney);
} }
void Overworld_ResetStateAfterDigEscRope(void) void Overworld_ResetStateAfterDigEscRope(void)
@ -1202,11 +1202,11 @@ static void DoCB1_Overworld(u16 newKeys, u16 heldKeys)
sub_8059204(); sub_8059204();
ClearPlayerFieldInput(&fieldInput); ClearPlayerFieldInput(&fieldInput);
GetPlayerFieldInput(&fieldInput, newKeys, heldKeys); GetPlayerFieldInput(&fieldInput, newKeys, heldKeys);
if (!ScriptContext2_IsEnabled()) if (!ArePlayerFieldControlsLocked())
{ {
if (ProcessPlayerFieldInput(&fieldInput) == 1) if (ProcessPlayerFieldInput(&fieldInput) == 1)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
HideMapNamePopup(); HideMapNamePopup();
} }
else else
@ -1224,7 +1224,7 @@ static void CB1_Overworld(void)
static void OverworldBasic(void) static void OverworldBasic(void)
{ {
ScriptContext2_RunScript(); ScriptContext_RunScript();
RunTasks(); RunTasks();
AnimateSprites(); AnimateSprites();
CameraUpdate(); CameraUpdate();
@ -1277,8 +1277,8 @@ void CB2_NewGame(void)
NewGameInitData(); NewGameInitData();
ResetInitialPlayerAvatarState(); ResetInitialPlayerAvatarState();
PlayTimeCounter_Start(); PlayTimeCounter_Start();
ScriptContext1_Init(); ScriptContext_Init();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
gFieldCallback = ExecuteTruckSequence; gFieldCallback = ExecuteTruckSequence;
do_load_map_stuff_loop(&gMain.state); do_load_map_stuff_loop(&gMain.state);
SetFieldVBlankCallback(); SetFieldVBlankCallback();
@ -1295,8 +1295,8 @@ void debug_sub_8058C00(void)
ResetSafariZoneFlag_(); ResetSafariZoneFlag_();
ResetInitialPlayerAvatarState(); ResetInitialPlayerAvatarState();
PlayTimeCounter_Start(); PlayTimeCounter_Start();
ScriptContext1_Init(); ScriptContext_Init();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
if (JOY_HELD(R_BUTTON)) if (JOY_HELD(R_BUTTON))
gFieldCallback = ExecuteTruckSequence; gFieldCallback = ExecuteTruckSequence;
@ -1322,8 +1322,8 @@ void CB2_WhiteOut(void)
ResetSafariZoneFlag_(); ResetSafariZoneFlag_();
DoWhiteOut(); DoWhiteOut();
ResetInitialPlayerAvatarState(); ResetInitialPlayerAvatarState();
ScriptContext1_Init(); ScriptContext_Init();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
gFieldCallback = sub_8080B60; gFieldCallback = sub_8080B60;
val = 0; val = 0;
do_load_map_stuff_loop(&val); do_load_map_stuff_loop(&val);
@ -1336,8 +1336,8 @@ void CB2_WhiteOut(void)
void CB2_LoadMap(void) void CB2_LoadMap(void)
{ {
FieldClearVBlankHBlankCallbacks(); FieldClearVBlankHBlankCallbacks();
ScriptContext1_Init(); ScriptContext_Init();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
SetMainCallback1(NULL); SetMainCallback1(NULL);
SetMainCallback2(sub_810CC80); SetMainCallback2(sub_810CC80);
gMain.savedCallback = CB2_LoadMap2; gMain.savedCallback = CB2_LoadMap2;
@ -1356,8 +1356,8 @@ void sub_8054534(void)
if (!gMain.state) if (!gMain.state)
{ {
FieldClearVBlankHBlankCallbacks(); FieldClearVBlankHBlankCallbacks();
ScriptContext1_Init(); ScriptContext_Init();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
SetMainCallback1(NULL); SetMainCallback1(NULL);
} }
if (sub_805493C(&gMain.state, 1)) if (sub_805493C(&gMain.state, 1))
@ -1422,8 +1422,8 @@ void sub_805465C(void)
SetMainCallback1(sub_8055354); SetMainCallback1(sub_8055354);
sub_80543DC(sub_8055390); sub_80543DC(sub_8055390);
gFieldCallback = sub_8080A3C; gFieldCallback = sub_8080A3C;
ScriptContext1_Init(); ScriptContext_Init();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
CB2_ReturnToField(); CB2_ReturnToField();
} }
@ -1478,8 +1478,8 @@ void CB2_ContinueSavedGame(void)
sub_805308C(); sub_805308C();
InitMapFromSavedGame(); InitMapFromSavedGame();
PlayTimeCounter_Start(); PlayTimeCounter_Start();
ScriptContext1_Init(); ScriptContext_Init();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
if (GetSecretBase2Field_9() == 1) if (GetSecretBase2Field_9() == 1)
{ {
ClearSecretBase2Field_9(); ClearSecretBase2Field_9();
@ -1537,8 +1537,8 @@ static bool32 sub_805483C(u8 *state)
{ {
case 0: case 0:
FieldClearVBlankHBlankCallbacks(); FieldClearVBlankHBlankCallbacks();
ScriptContext1_Init(); ScriptContext_Init();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
sub_8054F70(); sub_8054F70();
sub_8054BA8(); sub_8054BA8();
(*state)++; (*state)++;
@ -2139,7 +2139,7 @@ void sub_8055354(void)
u16 sub_8055390(u32 a1) u16 sub_8055390(u32 a1)
{ {
if (ScriptContext2_IsEnabled() == 1) if (ArePlayerFieldControlsLocked() == 1)
return 17; return 17;
if (gLink.recvQueue.count > 4) if (gLink.recvQueue.count > 4)
return 27; return 27;
@ -2156,7 +2156,7 @@ u16 sub_80553E0(u32 a1)
u16 sub_80553E4(u32 a1) u16 sub_80553E4(u32 a1)
{ {
u16 retVal; u16 retVal;
if (ScriptContext2_IsEnabled() == 1) if (ArePlayerFieldControlsLocked() == 1)
{ {
retVal = 17; retVal = 17;
} }
@ -2178,7 +2178,7 @@ u16 sub_8055408(u32 a1)
else else
{ {
retVal = 26; retVal = 26;
ScriptContext2_Disable(); UnlockPlayerFieldControls();
sub_80543DC(sub_80553E0); sub_80543DC(sub_80553E0);
} }
return retVal; return retVal;
@ -2194,7 +2194,7 @@ u16 sub_8055438(u32 a1)
else else
{ {
retVal = 26; retVal = 26;
ScriptContext2_Disable(); UnlockPlayerFieldControls();
sub_80543DC(sub_80553E0); sub_80543DC(sub_80553E0);
} }
return retVal; return retVal;
@ -2233,7 +2233,7 @@ u16 sub_80554BC(u32 a1)
{ {
if (sub_8054F88(0x83) == TRUE) if (sub_8054F88(0x83) == TRUE)
{ {
ScriptContext1_SetupScript(gUnknown_081A4508); ScriptContext_SetupScript(gUnknown_081A4508);
sub_80543DC(sub_80554B8); sub_80543DC(sub_80554B8);
} }
return 17; return 17;
@ -2390,41 +2390,41 @@ static u16 sub_8055758(const u8 *script)
void sub_80557E8(void) void sub_80557E8(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
void sub_80557F4(void) void sub_80557F4(void)
{ {
PlaySE(SE_WIN_OPEN); PlaySE(SE_WIN_OPEN);
sub_8071310(); sub_8071310();
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
static void sub_8055808(const u8 *script) static void sub_8055808(const u8 *script)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
ScriptContext1_SetupScript(script); ScriptContext_SetupScript(script);
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
void sub_8055824(void) void sub_8055824(void)
{ {
PlaySE(SE_WIN_OPEN); PlaySE(SE_WIN_OPEN);
ScriptContext1_SetupScript(TradeRoom_PromptToCancelLink); ScriptContext_SetupScript(TradeRoom_PromptToCancelLink);
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
static void sub_8055840(const u8 *script) static void sub_8055840(const u8 *script)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
ScriptContext1_SetupScript(script); ScriptContext_SetupScript(script);
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
void sub_805585C(void) void sub_805585C(void)
{ {
ScriptContext1_SetupScript(TradeRoom_TerminateLink); ScriptContext_SetupScript(TradeRoom_TerminateLink);
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
bool32 sub_8055870(void) bool32 sub_8055870(void)

6
src/player_pc.c
View File

@ -291,14 +291,14 @@ static void PlayerPC_TurnOff(u8 taskId)
Menu_EraseWindowRect(0, 0, 0x1D, 0x13); Menu_EraseWindowRect(0, 0, 0x1D, 0x13);
if (gSaveBlock2.playerGender == MALE) if (gSaveBlock2.playerGender == MALE)
ScriptContext1_SetupScript(gBrendanHouse_TurnPCOff); ScriptContext_SetupScript(gBrendanHouse_TurnPCOff);
else else
ScriptContext1_SetupScript(gMayHouse_TurnPCOff); ScriptContext_SetupScript(gMayHouse_TurnPCOff);
} }
else else
{ {
Menu_EraseWindowRect(0, 0, 10, 9); Menu_EraseWindowRect(0, 0, 10, 9);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
DestroyTask(taskId); DestroyTask(taskId);
} }

2
src/pokemon_menu.c
View File

@ -926,7 +926,7 @@ void debug_sub_80986AC(void)
&& IsPlayerSurfingNorth() == TRUE) && IsPlayerSurfingNorth() == TRUE)
sub_808AE08(); sub_808AE08();
else else
ScriptContext2_Disable(); UnlockPlayerFieldControls();
} }
#endif #endif

6
src/pokemon_storage_system.c
View File

@ -284,8 +284,8 @@ void Task_PokemonStorageSystem(u8 taskId)
case 3: case 3:
Menu_DestroyCursor(); Menu_DestroyCursor();
Menu_EraseWindowRect(0, 0, 13, 9); Menu_EraseWindowRect(0, 0, 13, 9);
ScriptContext2_Disable(); UnlockPlayerFieldControls();
EnableBothScriptContexts(); ScriptContext_Enable();
DestroyTask(taskId); DestroyTask(taskId);
break; break;
default: default:
@ -352,7 +352,7 @@ void ShowPokemonStorageSystem(void)
u8 taskId = CreateTask(Task_PokemonStorageSystem, 80); u8 taskId = CreateTask(Task_PokemonStorageSystem, 80);
gTasks[taskId].data[0] = 0; gTasks[taskId].data[0] = 0;
gTasks[taskId].data[1] = 0; gTasks[taskId].data[1] = 0;
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
void FieldCB_ReturnToOverworld(void) void FieldCB_ReturnToOverworld(void)

8
src/pokemon_storage_system_2.c
View File

@ -924,7 +924,7 @@ void sub_809746C(void)
} }
break; break;
case 2: case 2:
party_compaction(); CompactPartySlots();
sub_8099310(); sub_8099310();
gPokemonStorageSystemPtr->unk_0004++; gPokemonStorageSystemPtr->unk_0004++;
break; break;
@ -1011,7 +1011,7 @@ void sub_8097594(void)
sub_8098A5C(); sub_8098A5C();
if (gUnknown_0203847C) if (gUnknown_0203847C)
{ {
party_compaction(); CompactPartySlots();
sub_8099310(); sub_8099310();
gPokemonStorageSystemPtr->unk_0004++; gPokemonStorageSystemPtr->unk_0004++;
} }
@ -1125,7 +1125,7 @@ void sub_8097858(void)
switch (gPokemonStorageSystemPtr->unk_0004) switch (gPokemonStorageSystemPtr->unk_0004)
{ {
case 0: case 0:
party_compaction(); CompactPartySlots();
sub_8099310(); sub_8099310();
gPokemonStorageSystemPtr->unk_0004++; gPokemonStorageSystemPtr->unk_0004++;
break; break;
@ -1703,7 +1703,7 @@ bool8 sub_80985CC(void)
{ {
gUnknown_0203847C = 0; gUnknown_0203847C = 0;
sub_809954C(); sub_809954C();
party_compaction(); CompactPartySlots();
sub_809D034(BG_SCREEN_ADDR(15), 21, 0, gPokemonStorageSystemPtr->unk_00a8, 12, 0, 1, 2); sub_809D034(BG_SCREEN_ADDR(15), 21, 0, gPokemonStorageSystemPtr->unk_00a8, 12, 0, 1, 2);
return FALSE; return FALSE;
} }

2
src/pokemon_storage_system_3.c
View File

@ -295,7 +295,7 @@ void sub_8099200(bool8 a0)
{ {
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
// this routine assumes party_compaction has been called // this routine assumes CompactPartySlots has been called
gPokemonStorageSystemPtr->unk_1038[i]->y -= 0xa0; gPokemonStorageSystemPtr->unk_1038[i]->y -= 0xa0;
gPokemonStorageSystemPtr->unk_1038[i]->invisible = TRUE; gPokemonStorageSystemPtr->unk_1038[i]->invisible = TRUE;
} }

2
src/pokemon_storage_system_4.c
View File

@ -1585,7 +1585,7 @@ void sub_809BD14(void)
sBoxCursorPosition = pssData.monIndex; sBoxCursorPosition = pssData.monIndex;
} }
s16 party_compaction(void) s16 CompactPartySlots(void)
{ {
s16 retVal = -1; s16 retVal = -1;
u16 i; u16 i;

2
src/record_mixing.c
View File

@ -166,7 +166,7 @@ void Task_RecordMixing_Main(u8 taskId)
sub_8055588(); sub_8055588();
Menu_EraseScreen(); Menu_EraseScreen();
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
break; break;
} }

8
src/reset_rtc_screen.c
View File

@ -614,7 +614,7 @@ void debug_sub_806F908(u8 taskId)
RtcCalcLocalTimeOffset(gLocalTime.days, gLocalTime.hours, gLocalTime.minutes, gLocalTime.seconds); RtcCalcLocalTimeOffset(gLocalTime.days, gLocalTime.hours, gLocalTime.minutes, gLocalTime.seconds);
DestroyTask(data[1]); DestroyTask(data[1]);
Menu_EraseScreen(); Menu_EraseScreen();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskId); DestroyTask(taskId);
} }
break; break;
@ -625,14 +625,14 @@ void debug_sub_806F99C(void)
{ {
RtcCalcLocalTime(); RtcCalcLocalTime();
CreateTask(debug_sub_806F908, 80); CreateTask(debug_sub_806F908, 80);
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
void debug_sub_806F9B8(void) void debug_sub_806F9B8(void)
{ {
gLocalTime = gSaveBlock2.lastBerryTreeUpdate; gLocalTime = gSaveBlock2.lastBerryTreeUpdate;
CreateTask(debug_sub_806F908, 80); CreateTask(debug_sub_806F908, 80);
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
static const u8 sDebugText_Days[] = DTR("にっすう", "days"); static const u8 sDebugText_Days[] = DTR("にっすう", "days");
@ -683,7 +683,7 @@ void debug_sub_806F9E4(u8 taskId)
{ {
Menu_EraseScreen(); Menu_EraseScreen();
DestroyTask(taskId); DestroyTask(taskId);
ScriptContext2_Disable(); UnlockPlayerFieldControls();
} }
} }
break; break;

8
src/rom6.c
View File

@ -62,7 +62,7 @@ static void task08_080C9820(u8 taskId)
{ {
u8 objEventId; u8 objEventId;
ScriptContext2_Enable(); LockPlayerFieldControls();
gPlayerAvatar.preventStep = TRUE; gPlayerAvatar.preventStep = TRUE;
objEventId = gPlayerAvatar.objectEventId; objEventId = gPlayerAvatar.objectEventId;
if (!ObjectEventIsMovementOverridden(&gObjectEvents[objEventId]) if (!ObjectEventIsMovementOverridden(&gObjectEvents[objEventId])
@ -130,7 +130,7 @@ void debug_sub_8120968(void)
} }
else else
{ {
ScriptContext2_Disable(); UnlockPlayerFieldControls();
} }
} }
#endif #endif
@ -152,7 +152,7 @@ bool8 SetUpFieldMove_RockSmash(void)
static void sub_810B53C(void) static void sub_810B53C(void)
{ {
gFieldEffectArguments[0] = gLastFieldPokeMenuOpened; gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
ScriptContext1_SetupScript(S_UseRockSmash); ScriptContext_SetupScript(S_UseRockSmash);
} }
int FldEff_RockSmash(void) int FldEff_RockSmash(void)
@ -169,7 +169,7 @@ static void sub_810B58C(void)
{ {
PlaySE(SE_M_ROCK_THROW); PlaySE(SE_M_ROCK_THROW);
FieldEffectActiveListRemove(FLDEFF_USE_ROCK_SMASH); FieldEffectActiveListRemove(FLDEFF_USE_ROCK_SMASH);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
int SetUpFieldMove_Dig(void) int SetUpFieldMove_Dig(void)

6
src/roulette.c
View File

@ -1598,7 +1598,7 @@ void sub_81175C0(u8 taskid)
unk_203955C[0] = 0; unk_203955C[0] = 0;
#endif #endif
Menu_EraseScreen(); Menu_EraseScreen();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskid); DestroyTask(taskid);
} }
@ -1609,7 +1609,7 @@ void sub_81175DC(u8 taskid)
return; return;
gSpecialVar_0x8004 = 1; gSpecialVar_0x8004 = 1;
Menu_EraseScreen(); Menu_EraseScreen();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskid); DestroyTask(taskid);
} }
@ -1783,7 +1783,7 @@ void PlayRoulette(void)
{ {
u8 taskid; u8 taskid;
ScriptContext2_Enable(); LockPlayerFieldControls();
#if DEBUG #if DEBUG
unk_2039560 = 0; unk_2039560 = 0;
if (unk_203955C[0] != 0) if (unk_203955C[0] != 0)

10
src/safari_zone.c
View File

@ -82,7 +82,7 @@ bool8 SafariZoneTakeStep(void)
gSafariZoneStepCounter--; gSafariZoneStepCounter--;
if (gSafariZoneStepCounter == 0) if (gSafariZoneStepCounter == 0)
{ {
ScriptContext1_SetupScript(&gUnknown_081C3448); ScriptContext_SetupScript(&gUnknown_081C3448);
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
@ -90,7 +90,7 @@ bool8 SafariZoneTakeStep(void)
void SafariZoneRetirePrompt(void) void SafariZoneRetirePrompt(void)
{ {
ScriptContext1_SetupScript(&gUnknown_081C342D); ScriptContext_SetupScript(&gUnknown_081C342D);
} }
void sub_80C824C(void) void sub_80C824C(void)
@ -101,15 +101,15 @@ void sub_80C824C(void)
} }
else if (gBattleOutcome == 8) else if (gBattleOutcome == 8)
{ {
ScriptContext2_RunNewScript(&gUnknown_081C340A); RunScriptImmediately(&gUnknown_081C340A);
WarpIntoMap(); WarpIntoMap();
gFieldCallback = sub_8080E44; gFieldCallback = sub_8080E44;
SetMainCallback2(CB2_LoadMap); SetMainCallback2(CB2_LoadMap);
} }
else if (gBattleOutcome == 7) else if (gBattleOutcome == 7)
{ {
ScriptContext1_SetupScript(&gUnknown_081C3459); ScriptContext_SetupScript(&gUnknown_081C3459);
ScriptContext1_Stop(); ScriptContext_Stop();
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
} }
} }

40
src/scrcmd.c
View File

@ -48,7 +48,7 @@
typedef u16 (*SpecialFunc)(void); typedef u16 (*SpecialFunc)(void);
typedef void (*NativeFunc)(void); typedef void (*NativeFunc)(void);
extern u32 gUnknown_0202E8AC; extern u32 gRamScriptRetAddr;
static EWRAM_DATA u32 gUnknown_0202E8B0 = 0; static EWRAM_DATA u32 gUnknown_0202E8B0 = 0;
static EWRAM_DATA u16 sPauseCounter = 0; static EWRAM_DATA u16 sPauseCounter = 0;
@ -142,7 +142,7 @@ bool8 ScrCmd_callnative(struct ScriptContext *ctx)
bool8 ScrCmd_waitstate(struct ScriptContext *ctx) bool8 ScrCmd_waitstate(struct ScriptContext *ctx)
{ {
ScriptContext1_Stop(); ScriptContext_Stop();
return TRUE; return TRUE;
} }
@ -283,7 +283,7 @@ bool8 ScrCmd_callstd_if(struct ScriptContext *ctx)
bool8 ScrCmd_gotoram(struct ScriptContext *ctx) bool8 ScrCmd_gotoram(struct ScriptContext *ctx)
{ {
ScriptJump(ctx, (u8 *)gUnknown_0202E8AC); ScriptJump(ctx, (u8 *)gRamScriptRetAddr);
return FALSE; return FALSE;
} }
@ -605,7 +605,7 @@ bool8 ScrCmd_incrementgamestat(struct ScriptContext *ctx)
bool8 ScrCmd_animateflash(struct ScriptContext *ctx) bool8 ScrCmd_animateflash(struct ScriptContext *ctx)
{ {
sub_8081594(ScriptReadByte(ctx)); sub_8081594(ScriptReadByte(ctx));
ScriptContext1_Stop(); ScriptContext_Stop();
return TRUE; return TRUE;
} }
@ -1281,7 +1281,7 @@ bool8 ScrCmd_yesnobox(struct ScriptContext *ctx)
if (ScriptMenu_YesNo(left, top) == TRUE) if (ScriptMenu_YesNo(left, top) == TRUE)
{ {
ScriptContext1_Stop(); ScriptContext_Stop();
return TRUE; return TRUE;
} }
else else
@ -1299,7 +1299,7 @@ bool8 ScrCmd_multichoice(struct ScriptContext *ctx)
if (ScriptMenu_Multichoice(left, top, multichoiceId, ignoreBPress) == TRUE) if (ScriptMenu_Multichoice(left, top, multichoiceId, ignoreBPress) == TRUE)
{ {
ScriptContext1_Stop(); ScriptContext_Stop();
return TRUE; return TRUE;
} }
else else
@ -1318,7 +1318,7 @@ bool8 ScrCmd_multichoicedefault(struct ScriptContext *ctx)
if (ScriptMenu_MultichoiceWithDefault(left, top, multichoiceId, ignoreBPress, defaultChoice) == TRUE) if (ScriptMenu_MultichoiceWithDefault(left, top, multichoiceId, ignoreBPress, defaultChoice) == TRUE)
{ {
ScriptContext1_Stop(); ScriptContext_Stop();
return TRUE; return TRUE;
} }
else else
@ -1348,7 +1348,7 @@ bool8 ScrCmd_multichoicegrid(struct ScriptContext *ctx)
if (ScriptMenu_MultichoiceGrid(left, top, multichoiceId, ignoreBPress, numColumns) == TRUE) if (ScriptMenu_MultichoiceGrid(left, top, multichoiceId, ignoreBPress, numColumns) == TRUE)
{ {
ScriptContext1_Stop(); ScriptContext_Stop();
return TRUE; return TRUE;
} }
else else
@ -1378,7 +1378,7 @@ bool8 ScrCmd_drawboxtext(struct ScriptContext *ctx)
if (Multichoice(left, top, multichoiceId, ignoreBPress) == TRUE) if (Multichoice(left, top, multichoiceId, ignoreBPress) == TRUE)
{ {
ScriptContext1_Stop(); ScriptContext_Stop();
return TRUE; return TRUE;
} }
else else
@ -1414,7 +1414,7 @@ bool8 ScrCmd_showcontestwinner(struct ScriptContext *ctx)
if (v1) if (v1)
SetContestWinnerForPainting(v1); SetContestWinnerForPainting(v1);
ShowContestWinner(); ShowContestWinner();
ScriptContext1_Stop(); ScriptContext_Stop();
return TRUE; return TRUE;
} }
@ -1748,7 +1748,7 @@ bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx)
bool8 ScrCmd_dowildbattle(struct ScriptContext *ctx) bool8 ScrCmd_dowildbattle(struct ScriptContext *ctx)
{ {
BattleSetup_StartScriptedWildBattle(); BattleSetup_StartScriptedWildBattle();
ScriptContext1_Stop(); ScriptContext_Stop();
return TRUE; return TRUE;
} }
@ -1757,7 +1757,7 @@ bool8 ScrCmd_pokemart(struct ScriptContext *ctx)
void *ptr = (void *)ScriptReadWord(ctx); void *ptr = (void *)ScriptReadWord(ctx);
Shop_CreatePokemartMenu(ptr); Shop_CreatePokemartMenu(ptr);
ScriptContext1_Stop(); ScriptContext_Stop();
return TRUE; return TRUE;
} }
@ -1766,7 +1766,7 @@ bool8 ScrCmd_pokemartdecoration(struct ScriptContext *ctx)
void *ptr = (void *)ScriptReadWord(ctx); void *ptr = (void *)ScriptReadWord(ctx);
Shop_CreateDecorationShop1Menu(ptr); Shop_CreateDecorationShop1Menu(ptr);
ScriptContext1_Stop(); ScriptContext_Stop();
return TRUE; return TRUE;
} }
@ -1775,7 +1775,7 @@ bool8 ScrCmd_pokemartdecoration2(struct ScriptContext *ctx)
void *ptr = (void *)ScriptReadWord(ctx); void *ptr = (void *)ScriptReadWord(ctx);
Shop_CreateDecorationShop2Menu(ptr); Shop_CreateDecorationShop2Menu(ptr);
ScriptContext1_Stop(); ScriptContext_Stop();
return TRUE; return TRUE;
} }
@ -1784,7 +1784,7 @@ bool8 ScrCmd_playslotmachine(struct ScriptContext *ctx)
u8 v2 = VarGet(ScriptReadHalfword(ctx)); u8 v2 = VarGet(ScriptReadHalfword(ctx));
PlaySlotMachine(v2, CB2_ReturnToFieldContinueScriptPlayMapMusic); PlaySlotMachine(v2, CB2_ReturnToFieldContinueScriptPlayMapMusic);
ScriptContext1_Stop(); ScriptContext_Stop();
return TRUE; return TRUE;
} }
@ -1812,28 +1812,28 @@ bool8 ScrCmd_getpricereduction(struct ScriptContext *ctx)
bool8 ScrCmd_choosecontestmon(struct ScriptContext *ctx) bool8 ScrCmd_choosecontestmon(struct ScriptContext *ctx)
{ {
sub_80F99CC(); sub_80F99CC();
ScriptContext1_Stop(); ScriptContext_Stop();
return TRUE; return TRUE;
} }
bool8 ScrCmd_startcontest(struct ScriptContext *ctx) bool8 ScrCmd_startcontest(struct ScriptContext *ctx)
{ {
sub_80C48C8(); sub_80C48C8();
ScriptContext1_Stop(); ScriptContext_Stop();
return TRUE; return TRUE;
} }
bool8 ScrCmd_showcontestresults(struct ScriptContext *ctx) bool8 ScrCmd_showcontestresults(struct ScriptContext *ctx)
{ {
sub_80C4940(); sub_80C4940();
ScriptContext1_Stop(); ScriptContext_Stop();
return TRUE; return TRUE;
} }
bool8 ScrCmd_contestlinktransfer(struct ScriptContext *ctx) bool8 ScrCmd_contestlinktransfer(struct ScriptContext *ctx)
{ {
ContestLinkTransfer(gSpecialVar_ContestCategory); ContestLinkTransfer(gSpecialVar_ContestCategory);
ScriptContext1_Stop(); ScriptContext_Stop();
return TRUE; return TRUE;
} }
@ -1987,7 +1987,7 @@ bool8 ScrCmd_addelevmenuitem(struct ScriptContext *ctx)
bool8 ScrCmd_showelevmenu(struct ScriptContext *ctx) bool8 ScrCmd_showelevmenu(struct ScriptContext *ctx)
{ {
ScriptShowElevatorMenu(); ScriptShowElevatorMenu();
ScriptContext1_Stop(); ScriptContext_Stop();
return TRUE; return TRUE;
} }

202
src/script.c
View File

@ -4,25 +4,29 @@
#include "constants/map_scripts.h" #include "constants/map_scripts.h"
#define RAM_SCRIPT_MAGIC 51 #define RAM_SCRIPT_MAGIC 51
#define SCRIPT_STACK_SIZE 20
enum enum {
{
SCRIPT_MODE_STOPPED, SCRIPT_MODE_STOPPED,
SCRIPT_MODE_BYTECODE, SCRIPT_MODE_BYTECODE,
SCRIPT_MODE_NATIVE, SCRIPT_MODE_NATIVE,
}; };
EWRAM_DATA const u8 *gUnknown_0202E8AC = NULL; enum {
CONTEXT_RUNNING,
CONTEXT_WAITING,
CONTEXT_SHUTDOWN,
};
static u8 sScriptContext1Status; EWRAM_DATA const u8 *gRamScriptRetAddr = NULL;
static struct ScriptContext sScriptContext1;
static struct ScriptContext sScriptContext2; static u8 sGlobalScriptContextStatus;
static bool8 sScriptContext2Enabled; static struct ScriptContext sGlobalScriptContext;
static struct ScriptContext sImmediateScriptContext;
static bool8 sLockFieldControls;
extern ScrCmdFunc gScriptCmdTable[]; extern ScrCmdFunc gScriptCmdTable[];
extern ScrCmdFunc gScriptCmdTableEnd[]; extern ScrCmdFunc gScriptCmdTableEnd[];
extern void *gNullScriptPtr; extern void *const gNullScriptPtr;
void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEnd) void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEnd)
{ {
@ -35,11 +39,11 @@ void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTable
ctx->cmdTable = cmdTable; ctx->cmdTable = cmdTable;
ctx->cmdTableEnd = cmdTableEnd; ctx->cmdTableEnd = cmdTableEnd;
for (i = 0; i < 4; i++) for (i = 0; i < (int)ARRAY_COUNT(ctx->data); i++)
ctx->data[i] = 0; ctx->data[i] = 0;
for (i = 0; i < SCRIPT_STACK_SIZE; i++) for (i = 0; i < (int)ARRAY_COUNT(ctx->stack); i++)
ctx->stack[i] = 0; ctx->stack[i] = NULL;
} }
u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr) u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr)
@ -71,6 +75,8 @@ bool8 RunScriptCommand(struct ScriptContext *ctx)
case SCRIPT_MODE_STOPPED: case SCRIPT_MODE_STOPPED:
return FALSE; return FALSE;
case SCRIPT_MODE_NATIVE: case SCRIPT_MODE_NATIVE:
// Try to call a function in C
// Continue to bytecode if no function or it returns TRUE
if (ctx->nativePtr) if (ctx->nativePtr)
{ {
if (ctx->nativePtr() == TRUE) if (ctx->nativePtr() == TRUE)
@ -78,13 +84,14 @@ bool8 RunScriptCommand(struct ScriptContext *ctx)
return TRUE; return TRUE;
} }
ctx->mode = SCRIPT_MODE_BYTECODE; ctx->mode = SCRIPT_MODE_BYTECODE;
// fallthrough
case SCRIPT_MODE_BYTECODE: case SCRIPT_MODE_BYTECODE:
while (1) while (1)
{ {
u8 cmdCode; u8 cmdCode;
ScrCmdFunc *cmdFunc; ScrCmdFunc *func;
if (ctx->scriptPtr == NULL) if (!ctx->scriptPtr)
{ {
ctx->mode = SCRIPT_MODE_STOPPED; ctx->mode = SCRIPT_MODE_STOPPED;
return FALSE; return FALSE;
@ -98,15 +105,15 @@ bool8 RunScriptCommand(struct ScriptContext *ctx)
cmdCode = *(ctx->scriptPtr); cmdCode = *(ctx->scriptPtr);
ctx->scriptPtr++; ctx->scriptPtr++;
cmdFunc = &ctx->cmdTable[cmdCode]; func = &ctx->cmdTable[cmdCode];
if (cmdFunc >= ctx->cmdTableEnd) if (func >= ctx->cmdTableEnd)
{ {
ctx->mode = SCRIPT_MODE_STOPPED; ctx->mode = SCRIPT_MODE_STOPPED;
return FALSE; return FALSE;
} }
if ((*cmdFunc)(ctx) == TRUE) if ((*func)(ctx) == TRUE)
return TRUE; return TRUE;
} }
} }
@ -114,21 +121,21 @@ bool8 RunScriptCommand(struct ScriptContext *ctx)
return TRUE; return TRUE;
} }
u8 ScriptPush(struct ScriptContext *ctx, const u8 *ptr) static bool8 ScriptPush(struct ScriptContext *ctx, const u8 *ptr)
{ {
if (ctx->stackDepth + 1 >= SCRIPT_STACK_SIZE) if (ctx->stackDepth + 1 >= (int)ARRAY_COUNT(ctx->stack))
{ {
return 1; return TRUE;
} }
else else
{ {
ctx->stack[ctx->stackDepth] = ptr; ctx->stack[ctx->stackDepth] = ptr;
ctx->stackDepth++; ctx->stackDepth++;
return 0; return FALSE;
} }
} }
const u8 *ScriptPop(struct ScriptContext *ctx) static const u8 *ScriptPop(struct ScriptContext *ctx)
{ {
if (ctx->stackDepth == 0) if (ctx->stackDepth == 0)
return NULL; return NULL;
@ -137,12 +144,12 @@ const u8 *ScriptPop(struct ScriptContext *ctx)
return ctx->stack[ctx->stackDepth]; return ctx->stack[ctx->stackDepth];
} }
void ScriptJump(struct ScriptContext *ctx, u8 *ptr) void ScriptJump(struct ScriptContext *ctx, const u8 *ptr)
{ {
ctx->scriptPtr = ptr; ctx->scriptPtr = ptr;
} }
void ScriptCall(struct ScriptContext *ctx, u8 *ptr) void ScriptCall(struct ScriptContext *ctx, const u8 *ptr)
{ {
ScriptPush(ctx, ctx->scriptPtr); ScriptPush(ctx, ctx->scriptPtr);
ctx->scriptPtr = ptr; ctx->scriptPtr = ptr;
@ -169,89 +176,99 @@ u32 ScriptReadWord(struct ScriptContext *ctx)
return (((((value3 << 8) + value2) << 8) + value1) << 8) + value0; return (((((value3 << 8) + value2) << 8) + value1) << 8) + value0;
} }
void ScriptContext2_Enable(void) void LockPlayerFieldControls(void)
{ {
sScriptContext2Enabled = TRUE; sLockFieldControls = TRUE;
} }
void ScriptContext2_Disable(void) void UnlockPlayerFieldControls(void)
{ {
sScriptContext2Enabled = FALSE; sLockFieldControls = FALSE;
} }
bool8 ScriptContext2_IsEnabled(void) bool8 ArePlayerFieldControlsLocked(void)
{ {
return sScriptContext2Enabled; return sLockFieldControls;
} }
void ScriptContext1_Init(void) // Re-initializes the global script context to zero.
void ScriptContext_Init(void)
{ {
InitScriptContext(&sScriptContext1, gScriptCmdTable, gScriptCmdTableEnd); InitScriptContext(&sGlobalScriptContext, gScriptCmdTable, gScriptCmdTableEnd);
sScriptContext1Status = 2; sGlobalScriptContextStatus = CONTEXT_SHUTDOWN;
} }
bool8 ScriptContext2_RunScript(void) // Runs the script until the script makes a wait* call, then returns true if
// there's more script to run, or false if the script has hit the end.
// This function also returns false if the context is finished
// or waiting (after a call to _Stop)
bool8 ScriptContext_RunScript(void)
{ {
if (sScriptContext1Status == 2) if (sGlobalScriptContextStatus == CONTEXT_SHUTDOWN)
return 0; return FALSE;
if (sScriptContext1Status == 1) if (sGlobalScriptContextStatus == CONTEXT_WAITING)
return 0; return FALSE;
ScriptContext2_Enable(); LockPlayerFieldControls();
if (!RunScriptCommand(&sScriptContext1)) if (!RunScriptCommand(&sGlobalScriptContext))
{ {
sScriptContext1Status = 2; sGlobalScriptContextStatus = CONTEXT_SHUTDOWN;
ScriptContext2_Disable(); UnlockPlayerFieldControls();
return 0; return FALSE;
} }
return 1; return TRUE;
} }
void ScriptContext1_SetupScript(const u8 *ptr) // Sets up a new script in the global context and enables the context
void ScriptContext_SetupScript(const u8 *ptr)
{ {
InitScriptContext(&sScriptContext1, gScriptCmdTable, gScriptCmdTableEnd); InitScriptContext(&sGlobalScriptContext, gScriptCmdTable, gScriptCmdTableEnd);
SetupBytecodeScript(&sScriptContext1, ptr); SetupBytecodeScript(&sGlobalScriptContext, ptr);
ScriptContext2_Enable(); LockPlayerFieldControls();
sScriptContext1Status = 0; sGlobalScriptContextStatus = CONTEXT_RUNNING;
} }
void ScriptContext1_Stop(void) // Puts the script into waiting mode; usually called from a wait* script command.
void ScriptContext_Stop(void)
{ {
sScriptContext1Status = 1; sGlobalScriptContextStatus = CONTEXT_WAITING;
} }
void EnableBothScriptContexts() // Puts the script into running mode.
void ScriptContext_Enable(void)
{ {
sScriptContext1Status = 0; sGlobalScriptContextStatus = CONTEXT_RUNNING;
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
void ScriptContext2_RunNewScript(const u8 *ptr) // Sets up and runs a script in its own context immediately. The script will be
// finished when this function returns. Used mainly by all of the map header
// scripts (except the frame table scripts).
void RunScriptImmediately(const u8 *ptr)
{ {
InitScriptContext(&sScriptContext2, &gScriptCmdTable, &gScriptCmdTableEnd); InitScriptContext(&sImmediateScriptContext, &gScriptCmdTable, &gScriptCmdTableEnd);
SetupBytecodeScript(&sScriptContext2, ptr); SetupBytecodeScript(&sImmediateScriptContext, ptr);
while (RunScriptCommand(&sScriptContext2) == 1) while (RunScriptCommand(&sImmediateScriptContext) == TRUE);
;
} }
static u8 *mapheader_get_tagged_pointer(u8 tag) static u8 *MapHeaderGetScriptTable(u8 tag)
{ {
const u8 *mapScripts = gMapHeader.mapScripts; const u8 *mapScripts = gMapHeader.mapScripts;
if (mapScripts == NULL) if (!mapScripts)
return NULL; return NULL;
while (1) while (1)
{ {
if (*mapScripts == 0) if (!*mapScripts)
return NULL; return NULL;
if (*mapScripts == tag) if (*mapScripts == tag)
{ {
mapScripts++; mapScripts++;
return (u8 *)(mapScripts[0] + (mapScripts[1] << 8) + (mapScripts[2] << 16) + (mapScripts[3] << 24)); return T2_READ_PTR(mapScripts);
} }
mapScripts += 5; mapScripts += 5;
} }
@ -259,14 +276,14 @@ static u8 *mapheader_get_tagged_pointer(u8 tag)
static void MapHeaderRunScriptType(u8 tag) static void MapHeaderRunScriptType(u8 tag)
{ {
u8 *ptr = mapheader_get_tagged_pointer(tag); u8 *ptr = MapHeaderGetScriptTable(tag);
if (ptr) if (ptr)
ScriptContext2_RunNewScript(ptr); RunScriptImmediately(ptr);
} }
static u8 *MapHeaderCheckScriptTable(u8 tag) static u8 *MapHeaderCheckScriptTable(u8 tag)
{ {
u8 *ptr = mapheader_get_tagged_pointer(tag); u8 *ptr = MapHeaderGetScriptTable(tag);
if (!ptr) if (!ptr)
return NULL; return NULL;
@ -275,14 +292,20 @@ static u8 *MapHeaderCheckScriptTable(u8 tag)
{ {
u16 varIndex1; u16 varIndex1;
u16 varIndex2; u16 varIndex2;
varIndex1 = ptr[0] | (ptr[1] << 8);
// Read first var (or .2byte terminal value)
varIndex1 = T1_READ_16(ptr);
if (!varIndex1) if (!varIndex1)
return NULL; return NULL; // Reached end of table
ptr += 2; ptr += 2;
varIndex2 = ptr[0] | (ptr[1] << 8);
// Read second var
varIndex2 = T1_READ_16(ptr);
ptr += 2; ptr += 2;
// Run map script if vars are equal
if (VarGet(varIndex1) == VarGet(varIndex2)) if (VarGet(varIndex1) == VarGet(varIndex2))
return (u8 *)(ptr[0] + (ptr[1] << 8) + (ptr[2] << 16) + (ptr[3] << 24)); return T2_READ_PTR(ptr);
ptr += 4; ptr += 4;
} }
} }
@ -312,17 +335,17 @@ bool8 TryRunOnFrameMapScript(void)
u8 *ptr = MapHeaderCheckScriptTable(MAP_SCRIPT_ON_FRAME_TABLE); u8 *ptr = MapHeaderCheckScriptTable(MAP_SCRIPT_ON_FRAME_TABLE);
if (!ptr) if (!ptr)
return 0; return FALSE;
ScriptContext1_SetupScript(ptr); ScriptContext_SetupScript(ptr);
return 1; return TRUE;
} }
void TryRunOnWarpIntoMapScript(void) void TryRunOnWarpIntoMapScript(void)
{ {
u8 *ptr = MapHeaderCheckScriptTable(MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE); u8 *ptr = MapHeaderCheckScriptTable(MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE);
if (ptr) if (ptr)
ScriptContext2_RunNewScript(ptr); RunScriptImmediately(ptr);
} }
static u32 CalculateRamScriptChecksum(void) static u32 CalculateRamScriptChecksum(void)
@ -339,7 +362,7 @@ void ClearRamScript(void)
CpuFill32(0, &gSaveBlock1.ramScript, sizeof(struct RamScript)); CpuFill32(0, &gSaveBlock1.ramScript, sizeof(struct RamScript));
} }
bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId) bool8 InitRamScript(const u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 localId)
{ {
struct RamScriptData *scriptData = &gSaveBlock1.ramScript.data; struct RamScriptData *scriptData = &gSaveBlock1.ramScript.data;
@ -351,27 +374,30 @@ bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objec
scriptData->magic = RAM_SCRIPT_MAGIC; scriptData->magic = RAM_SCRIPT_MAGIC;
scriptData->mapGroup = mapGroup; scriptData->mapGroup = mapGroup;
scriptData->mapNum = mapNum; scriptData->mapNum = mapNum;
scriptData->objectId = objectId; scriptData->localId = localId;
memcpy(scriptData->script, script, scriptSize); memcpy(scriptData->script, script, scriptSize);
gSaveBlock1.ramScript.checksum = CalculateRamScriptChecksum(); gSaveBlock1.ramScript.checksum = CalculateRamScriptChecksum();
return TRUE; return TRUE;
} }
const u8 *GetRamScript(u8 objectId, const u8 *script) const u8 *GetRamScript(u8 localId, const u8 *script)
{ {
struct RamScriptData *scriptData = &gSaveBlock1.ramScript.data; struct RamScriptData *scriptData = &gSaveBlock1.ramScript.data;
gUnknown_0202E8AC = 0; gRamScriptRetAddr = NULL;
if (scriptData->magic == RAM_SCRIPT_MAGIC if (scriptData->magic != RAM_SCRIPT_MAGIC)
&& scriptData->mapGroup == gSaveBlock1.location.mapGroup return script;
&& scriptData->mapNum == gSaveBlock1.location.mapNum if (scriptData->mapGroup != gSaveBlock1.location.mapGroup)
&& scriptData->objectId == objectId) return script;
if (scriptData->mapNum != gSaveBlock1.location.mapNum)
return script;
if (scriptData->localId != localId)
return script;
if (CalculateRamScriptChecksum() != gSaveBlock1.ramScript.checksum)
{ {
if (CalculateRamScriptChecksum() == gSaveBlock1.ramScript.checksum)
{
gUnknown_0202E8AC = script;
return scriptData->script;
}
ClearRamScript(); ClearRamScript();
return script;
} }
return script;
gRamScriptRetAddr = script;
return scriptData->script;
} }

6
src/script_menu.c
View File

@ -708,7 +708,7 @@ static void Task_HandleMultichoiceInput(u8 taskId)
Menu_DestroyCursor(); Menu_DestroyCursor();
Menu_EraseWindowRect(gTasks[taskId].tLeft, gTasks[taskId].tTop, gTasks[taskId].tRight, gTasks[taskId].tBottom); Menu_EraseWindowRect(gTasks[taskId].tLeft, gTasks[taskId].tTop, gTasks[taskId].tRight, gTasks[taskId].tBottom);
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
} }
} }
@ -808,7 +808,7 @@ static void Task_HandleYesNoInput(u8 taskId)
Menu_EraseWindowRect(left, top, left + 6, top + 5); Menu_EraseWindowRect(left, top, left + 6, top + 5);
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress, u8 columnCount) bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress, u8 columnCount)
@ -870,7 +870,7 @@ static void Task_HandleMultichoiceGridInput(u8 taskId)
Menu_DestroyCursor(); Menu_DestroyCursor();
Menu_EraseWindowRect(gTasks[taskId].tLeft, gTasks[taskId].tTop, gTasks[taskId].tRight, gTasks[taskId].tBottom); Menu_EraseWindowRect(gTasks[taskId].tLeft, gTasks[taskId].tTop, gTasks[taskId].tRight, gTasks[taskId].tBottom);
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
} }

6
src/script_pokemon_util_80F99CC.c
View File

@ -33,7 +33,7 @@ void sub_80F99CC(void)
{ {
u8 taskId; u8 taskId;
ScriptContext2_Enable(); LockPlayerFieldControls();
taskId = CreateTask((void *)OpenPartyMenuFromScriptContext, 0xA); taskId = CreateTask((void *)OpenPartyMenuFromScriptContext, 0xA);
gTasks[taskId].data[0] = PARTY_MENU_TYPE_CONTEST; gTasks[taskId].data[0] = PARTY_MENU_TYPE_CONTEST;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
@ -43,7 +43,7 @@ void SelectMonForNPCTrade(void)
{ {
u8 taskId; u8 taskId;
ScriptContext2_Enable(); LockPlayerFieldControls();
taskId = CreateTask((void *)OpenPartyMenuFromScriptContext, 0xA); taskId = CreateTask((void *)OpenPartyMenuFromScriptContext, 0xA);
gTasks[taskId].data[0] = PARTY_MENU_TYPE_IN_GAME_TRADE; gTasks[taskId].data[0] = PARTY_MENU_TYPE_IN_GAME_TRADE;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
@ -53,7 +53,7 @@ void SelectMoveTutorMon(void)
{ {
u8 taskId; u8 taskId;
ScriptContext2_Enable(); LockPlayerFieldControls();
taskId = CreateTask((void *)OpenPartyMenuFromScriptContext, 0xA); taskId = CreateTask((void *)OpenPartyMenuFromScriptContext, 0xA);
gTasks[taskId].data[0] = PARTY_MENU_TYPE_MOVE_TUTOR; gTasks[taskId].data[0] = PARTY_MENU_TYPE_MOVE_TUTOR;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));

16
src/secret_base.c
View File

@ -403,7 +403,7 @@ void sub_80BBB50(u8 taskid)
ObjectEventTurn(&(gObjectEvents[gPlayerAvatar.objectEventId]), 2); ObjectEventTurn(&(gObjectEvents[gPlayerAvatar.objectEventId]), 2);
if (IsWeatherNotFadingIn() == 1) if (IsWeatherNotFadingIn() == 1)
{ {
EnableBothScriptContexts(); ScriptContext_Enable();
DestroyTask(taskid); DestroyTask(taskid);
} }
} }
@ -412,7 +412,7 @@ void sub_80BBB90(void)
{ {
s16 x, y; s16 x, y;
ScriptContext2_Enable(); LockPlayerFieldControls();
HideMapNamePopup(); HideMapNamePopup();
sub_80BB764(&x, &y, 0x220); sub_80BB764(&x, &y, 0x220);
MapGridSetMetatileIdAt(x + 7, y + 7, 0xe20); MapGridSetMetatileIdAt(x + 7, y + 7, 0xe20);
@ -565,7 +565,7 @@ void sub_80BC038(struct MapPosition *position, const struct MapEvents *events)
{ {
SetCurrentSecretBaseFromPosition(position, events); SetCurrentSecretBaseFromPosition(position, events);
SetCurrentSecretBaseVar(); SetCurrentSecretBaseVar();
ScriptContext1_SetupScript(gUnknown_081A2E14); ScriptContext_SetupScript(gUnknown_081A2E14);
} }
bool8 sub_80BC050(void) bool8 sub_80BC050(void)
@ -582,7 +582,7 @@ void sub_80BC074(u8 taskid)
switch (gTasks[taskid].data[0]) switch (gTasks[taskid].data[0])
{ {
case 0: case 0:
ScriptContext2_Enable(); LockPlayerFieldControls();
gTasks[taskid].data[0] = 1; gTasks[taskid].data[0] = 1;
break; break;
case 1: case 1:
@ -594,7 +594,7 @@ void sub_80BC074(u8 taskid)
WarpIntoMap(); WarpIntoMap();
gFieldCallback = mapldr_default; gFieldCallback = mapldr_default;
SetMainCallback2(CB2_LoadMap); SetMainCallback2(CB2_LoadMap);
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskid); DestroyTask(taskid);
break; break;
} }
@ -808,7 +808,7 @@ void Task_SecretBasePC_Registry(u8 taskId)
{ {
s16 *taskData; s16 *taskData;
ScriptContext2_Enable(); LockPlayerFieldControls();
ClearVerticalScrollIndicatorPalettes(); ClearVerticalScrollIndicatorPalettes();
LoadScrollIndicatorPalette(); LoadScrollIndicatorPalette();
@ -1093,9 +1093,9 @@ void sub_80BCC54(u8 taskId)
DestroyVerticalScrollIndicator(BOTTOM_ARROW); DestroyVerticalScrollIndicator(BOTTOM_ARROW);
if (curBaseIndex == 0) if (curBaseIndex == 0)
ScriptContext1_SetupScript(SecretBase_EventScript_PCCancel); ScriptContext_SetupScript(SecretBase_EventScript_PCCancel);
else else
ScriptContext1_SetupScript(SecretBase_EventScript_ShowRegisterMenu); ScriptContext_SetupScript(SecretBase_EventScript_ShowRegisterMenu);
DestroyTask(taskId); DestroyTask(taskId);
} }

10
src/shop.c
View File

@ -89,7 +89,7 @@ static const struct YesNoFuncTable sShopPurchaseYesNoFuncs[] =
static u8 CreateShopMenu(u8 martType) static u8 CreateShopMenu(u8 martType)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
gMartInfo.martType = martType; gMartInfo.martType = martType;
gMartInfo.cursor = 0; gMartInfo.cursor = 0;
@ -185,7 +185,7 @@ static void Task_HandleShopMenuQuit(u8 taskId)
Menu_DestroyCursor(); Menu_DestroyCursor();
Menu_EraseWindowRect(0, 0, 11, 8); Menu_EraseWindowRect(0, 0, 11, 8);
sub_80BE3BC(); sub_80BE3BC();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskId); DestroyTask(taskId);
if (gMartInfo.callback) if (gMartInfo.callback)
@ -1203,21 +1203,21 @@ void Shop_CreatePokemartMenu(u16 *itemList)
CreateShopMenu(MART_TYPE_0); CreateShopMenu(MART_TYPE_0);
SetShopItemsForSale(itemList); SetShopItemsForSale(itemList);
ClearItemPurchases(); ClearItemPurchases();
SetShopMenuCallback(EnableBothScriptContexts); SetShopMenuCallback(ScriptContext_Enable);
} }
void Shop_CreateDecorationShop1Menu(u16 *itemList) void Shop_CreateDecorationShop1Menu(u16 *itemList)
{ {
CreateShopMenu(MART_TYPE_1); CreateShopMenu(MART_TYPE_1);
SetShopItemsForSale(itemList); SetShopItemsForSale(itemList);
SetShopMenuCallback(EnableBothScriptContexts); SetShopMenuCallback(ScriptContext_Enable);
} }
void Shop_CreateDecorationShop2Menu(u16 *itemList) void Shop_CreateDecorationShop2Menu(u16 *itemList)
{ {
CreateShopMenu(MART_TYPE_2); CreateShopMenu(MART_TYPE_2);
SetShopItemsForSale(itemList); SetShopItemsForSale(itemList);
SetShopMenuCallback(EnableBothScriptContexts); SetShopMenuCallback(ScriptContext_Enable);
} }
#if DEBUG #if DEBUG

10
src/start_menu.c
View File

@ -198,7 +198,7 @@ void debug_sub_8075C40(u8 taskId)
if (JOY_NEW(A_BUTTON)) if (JOY_NEW(A_BUTTON))
{ {
Menu_EraseScreen(); Menu_EraseScreen();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
DestroyTask(taskId); DestroyTask(taskId);
} }
break; break;
@ -208,7 +208,7 @@ void debug_sub_8075C40(u8 taskId)
void debug_sub_8075D9C(void) void debug_sub_8075D9C(void)
{ {
CreateTask(debug_sub_8075C40, 10); CreateTask(debug_sub_8075C40, 10);
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
void debug_sub_8075DB4(struct BattleTowerEReaderTrainer *ereaderTrainer, const u8 *b, u32 trainerId) void debug_sub_8075DB4(struct BattleTowerEReaderTrainer *ereaderTrainer, const u8 *b, u32 trainerId)
@ -410,7 +410,7 @@ void sub_8071310(void)
sub_80597F4(); sub_80597F4();
} }
CreateStartMenuTask(sub_80712B4); CreateStartMenuTask(sub_80712B4);
ScriptContext2_Enable(); LockPlayerFieldControls();
} }
static u8 StartMenu_InputProcessCallback(void) static u8 StartMenu_InputProcessCallback(void)
@ -589,7 +589,7 @@ static u8 SaveCallback2(void)
case SAVE_ERROR: case SAVE_ERROR:
Menu_EraseScreen(); Menu_EraseScreen();
ScriptUnfreezeObjectEvents(); ScriptUnfreezeObjectEvents();
ScriptContext2_Disable(); UnlockPlayerFieldControls();
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
@ -645,7 +645,7 @@ static void Task_SaveDialog(u8 taskId)
return; return;
} }
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
static void sub_8071700(void) static void sub_8071700(void)

12
src/strings.c
View File

@ -19,8 +19,8 @@ const u8 gExpandedPlaceholder_Brendan[] = _("BRENDAN");
const u8 gExpandedPlaceholder_May[] = _("MAY"); const u8 gExpandedPlaceholder_May[] = _("MAY");
// system text // system text
const u8 gSystemText_Egg[] = _("EGG"); const u8 gText_EggNickname[] = _("EGG");
const u8 gSystemText_Pokemon2[] = _("POKéMON"); const u8 gText_Pokemon[] = _("POKéMON");
// main menu text // main menu text
const u8 gMainMenuString_NewGame[] = _("NEW GAME"); const u8 gMainMenuString_NewGame[] = _("NEW GAME");
@ -926,7 +926,7 @@ const u8 gSystemText_ClockResetDataSave[] = _("The clock has been reset.\nData w
const u8 gSystemText_SaveCompleted[] = _("Save completed."); const u8 gSystemText_SaveCompleted[] = _("Save completed.");
const u8 gSystemText_SaveFailed[] = _("Save failed..."); const u8 gSystemText_SaveFailed[] = _("Save failed...");
const u8 gSystemText_NoSaveFileNoTime[] = _("There is no save file, so the time\ncan't be set."); const u8 gSystemText_NoSaveFileNoTime[] = _("There is no save file, so the time\ncan't be set.");
const u8 gSystemText_ClockAdjustmentUsable[] = _("The in-game clock adjustment system\nis now useable."); const u8 gText_InGameClockUsable[] = _("The in-game clock adjustment system\nis now useable.");
const u8 gSystemText_Saving[] = _("SAVING...\nDON'T TURN OFF THE POWER."); const u8 gSystemText_Saving[] = _("SAVING...\nDON'T TURN OFF THE POWER.");
#elif GERMAN #elif GERMAN
@ -947,8 +947,8 @@ const u8 gExpandedPlaceholder_Brendan[] = _("BRIX");
const u8 gExpandedPlaceholder_May[] = _("MAIKE"); const u8 gExpandedPlaceholder_May[] = _("MAIKE");
// system text // system text
const u8 gSystemText_Egg[] = _("EI"); const u8 gText_EggNickname[] = _("EI");
const u8 gSystemText_Pokemon2[] = _("POKéMON"); const u8 gText_Pokemon[] = _("POKéMON");
// main menu text // main menu text
const u8 gMainMenuString_NewGame[] = _("NEUES SPIEL"); const u8 gMainMenuString_NewGame[] = _("NEUES SPIEL");
@ -1851,6 +1851,6 @@ const u8 gSystemText_ClockResetDataSave[] = _("Die Uhr wurde zurückgestellt. Da
const u8 gSystemText_SaveCompleted[] = _("Speichern beendet."); const u8 gSystemText_SaveCompleted[] = _("Speichern beendet.");
const u8 gSystemText_SaveFailed[] = _("Speichern fehlgeschlagen."); const u8 gSystemText_SaveFailed[] = _("Speichern fehlgeschlagen.");
const u8 gSystemText_NoSaveFileNoTime[] = _("Es existiert kein Speicherstand. Uhr-\nzeit kann nicht eingestellt werden."); const u8 gSystemText_NoSaveFileNoTime[] = _("Es existiert kein Speicherstand. Uhr-\nzeit kann nicht eingestellt werden.");
const u8 gSystemText_ClockAdjustmentUsable[] = _("Das spielinterne Zeiteingabe-\nSystem ist jetzt verfügbar."); const u8 gText_InGameClockUsable[] = _("Das spielinterne Zeiteingabe-\nSystem ist jetzt verfügbar.");
const u8 gSystemText_Saving[] = _("SPEICHERVORGANG...\nGERÄT NICHT AUSSCHALTEN!"); const u8 gSystemText_Saving[] = _("SPEICHERVORGANG...\nGERÄT NICHT AUSSCHALTEN!");
#endif #endif

2
src/time_events.c
View File

@ -95,7 +95,7 @@ static void Task_WaitWeather(u8 taskId)
{ {
if (IsWeatherChangeComplete()) if (IsWeatherChangeComplete())
{ {
EnableBothScriptContexts(); ScriptContext_Enable();
DestroyTask(taskId); DestroyTask(taskId);
} }
} }

2
src/trade.c
View File

@ -5200,7 +5200,7 @@ static void sub_804E144(void)
void DoInGameTradeScene(void) void DoInGameTradeScene(void)
{ {
ScriptContext2_Enable(); LockPlayerFieldControls();
CreateTask(sub_804E1A0, 10); CreateTask(sub_804E1A0, 10);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
} }

6
src/trader.c
View File

@ -138,7 +138,7 @@ void sub_8109B34(u8 taskId, u8 decorationId)
Menu_DestroyCursor(); Menu_DestroyCursor();
Menu_EraseWindowRect(0, 1, 12, 12); Menu_EraseWindowRect(0, 1, 12, 12);
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
void Task_HandleGetDecorationMenuInput(u8 taskId) void Task_HandleGetDecorationMenuInput(u8 taskId)
@ -232,7 +232,7 @@ void sub_8109D04(u8 taskId)
gSpecialVar_0x8006 = 0xFFFF; gSpecialVar_0x8006 = 0xFFFF;
} }
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
void sub_8109DAC(u8 taskId) void sub_8109DAC(u8 taskId)
@ -241,7 +241,7 @@ void sub_8109DAC(u8 taskId)
Menu_EraseWindowRect(0, 0, 29, 19); Menu_EraseWindowRect(0, 0, 29, 19);
gSpecialVar_0x8006 = 0; gSpecialVar_0x8006 = 0;
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
void ScrSpecial_TraderDoDecorationTrade(void) void ScrSpecial_TraderDoDecorationTrade(void)

2
src/trainer_see.c
View File

@ -457,7 +457,7 @@ void EndTrainerApproach(void)
static void Task_DestroyTrainerApproachTask(u8 taskId) static void Task_DestroyTrainerApproachTask(u8 taskId)
{ {
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); ScriptContext_Enable();
} }
static const struct OamData gOamData_839B4D8 = { static const struct OamData gOamData_839B4D8 = {

2
src/wild_encounter.c
View File

@ -675,7 +675,7 @@ bool8 UpdateRepelCounter(void)
VarSet(VAR_REPEL_STEP_COUNT, steps); VarSet(VAR_REPEL_STEP_COUNT, steps);
if (steps == 0) if (steps == 0)
{ {
ScriptContext1_SetupScript(S_RepelWoreOff); ScriptContext_SetupScript(S_RepelWoreOff);
return TRUE; return TRUE;
} }
} }