diff options
Diffstat (limited to 'src/scrcmd.c')
| -rw-r--r-- | src/scrcmd.c | 450 |
1 files changed, 224 insertions, 226 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index c79a8bd1f..32ac5c4e2 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -21,7 +21,6 @@ #include "field_message_box.h" #include "new_menu_helpers.h" #include "window.h" -#include "start_menu.h" #include "script_menu.h" #include "string_util.h" #include "data.h" @@ -38,7 +37,6 @@ #include "field_effect.h" #include "fieldmap.h" #include "field_door.h" -#include "scrcmd.h" extern u16 (*const gSpecials[])(void); extern u16 (*const gSpecialsEnd[])(void); @@ -62,7 +60,7 @@ extern u8 gSelectedObjectEvent; // This is defined in here so the optimizer can't see its value when compiling // script.c. -void * const gNullScriptPtr = NULL; +void *const gNullScriptPtr = NULL; static const u8 sScriptConditionTable[6][3] = { @@ -75,30 +73,30 @@ static const u8 sScriptConditionTable[6][3] = 1, 0, 1, // != }; -bool8 ScrCmd_nop(struct ScriptContext *ctx) +bool8 ScrCmd_nop(struct ScriptContext * ctx) { return FALSE; } -bool8 ScrCmd_nop1(struct ScriptContext *ctx) +bool8 ScrCmd_nop1(struct ScriptContext * ctx) { return FALSE; } -bool8 ScrCmd_end(struct ScriptContext *ctx) +bool8 ScrCmd_end(struct ScriptContext * ctx) { StopScript(ctx); return FALSE; } -bool8 ScrCmd_gotonative(struct ScriptContext *ctx) +bool8 ScrCmd_gotonative(struct ScriptContext * ctx) { bool8 (*func)(void) = (bool8 (*)(void))ScriptReadWord(ctx); SetupNativeScript(ctx, func); return TRUE; } -bool8 ScrCmd_special(struct ScriptContext *ctx) +bool8 ScrCmd_special(struct ScriptContext * ctx) { u16 (*const *specialPtr)(void) = gSpecials + ScriptReadHalfword(ctx); if (specialPtr < gSpecialsEnd) @@ -108,7 +106,7 @@ bool8 ScrCmd_special(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_specialvar(struct ScriptContext *ctx) +bool8 ScrCmd_specialvar(struct ScriptContext * ctx) { u16 * varPtr = GetVarPointer(ScriptReadHalfword(ctx)); u16 (*const *specialPtr)(void) = gSpecials + ScriptReadHalfword(ctx); @@ -119,40 +117,40 @@ bool8 ScrCmd_specialvar(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_callnative(struct ScriptContext *ctx) +bool8 ScrCmd_callnative(struct ScriptContext * ctx) { void (*func )(void) = ((void (*)(void))ScriptReadWord(ctx)); func(); return FALSE; } -bool8 ScrCmd_waitstate(struct ScriptContext *ctx) +bool8 ScrCmd_waitstate(struct ScriptContext * ctx) { ScriptContext1_Stop(); return TRUE; } -bool8 ScrCmd_goto(struct ScriptContext *ctx) +bool8 ScrCmd_goto(struct ScriptContext * ctx) { const u8 * scrptr = (const u8 *)ScriptReadWord(ctx); ScriptJump(ctx, scrptr); return FALSE; } -bool8 ScrCmd_return(struct ScriptContext *ctx) +bool8 ScrCmd_return(struct ScriptContext * ctx) { ScriptReturn(ctx); return FALSE; } -bool8 ScrCmd_call(struct ScriptContext *ctx) +bool8 ScrCmd_call(struct ScriptContext * ctx) { const u8 * scrptr = (const u8 *)ScriptReadWord(ctx); ScriptCall(ctx, scrptr); return FALSE; } -bool8 ScrCmd_goto_if(struct ScriptContext *ctx) +bool8 ScrCmd_goto_if(struct ScriptContext * ctx) { u8 condition = ScriptReadByte(ctx); const u8 * scrptr = (const u8 *)ScriptReadWord(ctx); @@ -161,7 +159,7 @@ bool8 ScrCmd_goto_if(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_call_if(struct ScriptContext *ctx) +bool8 ScrCmd_call_if(struct ScriptContext * ctx) { u8 condition = ScriptReadByte(ctx); const u8 * scrptr = (const u8 *)ScriptReadWord(ctx); @@ -170,7 +168,7 @@ bool8 ScrCmd_call_if(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setvaddress(struct ScriptContext *ctx) +bool8 ScrCmd_setvaddress(struct ScriptContext * ctx) { u32 addr1 = (u32)ctx->scriptPtr - 1; u32 addr2 = ScriptReadWord(ctx); @@ -179,21 +177,21 @@ bool8 ScrCmd_setvaddress(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_vgoto(struct ScriptContext *ctx) +bool8 ScrCmd_vgoto(struct ScriptContext * ctx) { const u8 * scrptr = (const u8 *)ScriptReadWord(ctx); ScriptJump(ctx, scrptr - gVScriptOffset); return FALSE; } -bool8 ScrCmd_vcall(struct ScriptContext *ctx) +bool8 ScrCmd_vcall(struct ScriptContext * ctx) { const u8 * scrptr = (const u8 *)ScriptReadWord(ctx); ScriptCall(ctx, scrptr - gVScriptOffset); return FALSE; } -bool8 ScrCmd_vgoto_if(struct ScriptContext *ctx) +bool8 ScrCmd_vgoto_if(struct ScriptContext * ctx) { u8 condition = ScriptReadByte(ctx); const u8 * scrptr = (const u8 *)ScriptReadWord(ctx) - gVScriptOffset; @@ -202,7 +200,7 @@ bool8 ScrCmd_vgoto_if(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_vcall_if(struct ScriptContext *ctx) +bool8 ScrCmd_vcall_if(struct ScriptContext * ctx) { u8 condition = ScriptReadByte(ctx); const u8 * scrptr = (const u8 *)ScriptReadWord(ctx) - gVScriptOffset; @@ -211,7 +209,7 @@ bool8 ScrCmd_vcall_if(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_gotostd(struct ScriptContext *ctx) +bool8 ScrCmd_gotostd(struct ScriptContext * ctx) { u8 stdIdx = ScriptReadByte(ctx); const u8 *const * script = gStdScripts + stdIdx; @@ -220,7 +218,7 @@ bool8 ScrCmd_gotostd(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_callstd(struct ScriptContext *ctx) +bool8 ScrCmd_callstd(struct ScriptContext * ctx) { u8 stdIdx = ScriptReadByte(ctx); const u8 *const * script = gStdScripts + stdIdx; @@ -229,7 +227,7 @@ bool8 ScrCmd_callstd(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_gotostd_if(struct ScriptContext *ctx) +bool8 ScrCmd_gotostd_if(struct ScriptContext * ctx) { u8 condition = ScriptReadByte(ctx); u8 stdIdx = ScriptReadByte(ctx); @@ -242,7 +240,7 @@ bool8 ScrCmd_gotostd_if(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_callstd_if(struct ScriptContext *ctx) +bool8 ScrCmd_callstd_if(struct ScriptContext * ctx) { u8 condition = ScriptReadByte(ctx); u8 stdIdx = ScriptReadByte(ctx); @@ -255,26 +253,26 @@ bool8 ScrCmd_callstd_if(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_gotoram(struct ScriptContext *ctx) +bool8 ScrCmd_gotoram(struct ScriptContext * ctx) { ScriptJump(ctx, gRAMScriptPtr); return FALSE; } -bool8 ScrCmd_killscript(struct ScriptContext *ctx) +bool8 ScrCmd_killscript(struct ScriptContext * ctx) { ClearRamScript(); StopScript(ctx); return TRUE; } -bool8 ScrCmd_setmysteryeventstatus(struct ScriptContext *ctx) +bool8 ScrCmd_setmysteryeventstatus(struct ScriptContext * ctx) { SetMysteryEventScriptStatus(ScriptReadByte(ctx)); return FALSE; } -bool8 ScrCmd_execram(struct ScriptContext *ctx) +bool8 ScrCmd_execram(struct ScriptContext * ctx) { const u8 * script = sub_8069E48(); if (script != NULL) @@ -285,42 +283,42 @@ bool8 ScrCmd_execram(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_loadword(struct ScriptContext *ctx) +bool8 ScrCmd_loadword(struct ScriptContext * ctx) { u8 which = ScriptReadByte(ctx); ctx->data[which] = ScriptReadWord(ctx); return FALSE; } -bool8 ScrCmd_loadbytefromaddr(struct ScriptContext *ctx) +bool8 ScrCmd_loadbytefromaddr(struct ScriptContext * ctx) { u8 which = ScriptReadByte(ctx); ctx->data[which] = *(const u8 *)ScriptReadWord(ctx); return FALSE; } -bool8 ScrCmd_writebytetoaddr(struct ScriptContext *ctx) +bool8 ScrCmd_writebytetoaddr(struct ScriptContext * ctx) { u8 value = ScriptReadByte(ctx); *(u8 *)ScriptReadWord(ctx) = value; return FALSE; } -bool8 ScrCmd_loadbyte(struct ScriptContext *ctx) +bool8 ScrCmd_loadbyte(struct ScriptContext * ctx) { u8 which = ScriptReadByte(ctx); ctx->data[which] = ScriptReadByte(ctx); return FALSE; } -bool8 ScrCmd_setptrbyte(struct ScriptContext *ctx) +bool8 ScrCmd_setptrbyte(struct ScriptContext * ctx) { u8 which = ScriptReadByte(ctx); *(u8 *)ScriptReadWord(ctx) = ctx->data[which]; return FALSE; } -bool8 ScrCmd_copylocal(struct ScriptContext *ctx) +bool8 ScrCmd_copylocal(struct ScriptContext * ctx) { u8 whichDst = ScriptReadByte(ctx); u8 whichSrc = ScriptReadByte(ctx); @@ -328,21 +326,21 @@ bool8 ScrCmd_copylocal(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_copybyte(struct ScriptContext *ctx) +bool8 ScrCmd_copybyte(struct ScriptContext * ctx) { u8 * dest = (u8 *)ScriptReadWord(ctx); *dest = *(const u8 *)ScriptReadWord(ctx); return FALSE; } -bool8 ScrCmd_setvar(struct ScriptContext *ctx) +bool8 ScrCmd_setvar(struct ScriptContext * ctx) { u16 * varPtr = GetVarPointer(ScriptReadHalfword(ctx)); *varPtr = ScriptReadHalfword(ctx); return FALSE; } -bool8 ScrCmd_copyvar(struct ScriptContext *ctx) +bool8 ScrCmd_copyvar(struct ScriptContext * ctx) { u16 * destPtr = GetVarPointer(ScriptReadHalfword(ctx)); u16 * srcPtr = GetVarPointer(ScriptReadHalfword(ctx)); @@ -350,7 +348,7 @@ bool8 ScrCmd_copyvar(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setorcopyvar(struct ScriptContext *ctx) +bool8 ScrCmd_setorcopyvar(struct ScriptContext * ctx) { u16 * destPtr = GetVarPointer(ScriptReadHalfword(ctx)); *destPtr = VarGet(ScriptReadHalfword(ctx)); @@ -368,7 +366,7 @@ u8 compare_012(u16 left, u16 right) } // comparelocaltolocal -bool8 ScrCmd_compare_local_to_local(struct ScriptContext *ctx) +bool8 ScrCmd_compare_local_to_local(struct ScriptContext * ctx) { const u8 value1 = ctx->data[ScriptReadByte(ctx)]; const u8 value2 = ctx->data[ScriptReadByte(ctx)]; @@ -378,7 +376,7 @@ bool8 ScrCmd_compare_local_to_local(struct ScriptContext *ctx) } // comparelocaltoimm -bool8 ScrCmd_compare_local_to_value(struct ScriptContext *ctx) +bool8 ScrCmd_compare_local_to_value(struct ScriptContext * ctx) { const u8 value1 = ctx->data[ScriptReadByte(ctx)]; const u8 value2 = ScriptReadByte(ctx); @@ -387,7 +385,7 @@ bool8 ScrCmd_compare_local_to_value(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_compare_local_to_addr(struct ScriptContext *ctx) +bool8 ScrCmd_compare_local_to_addr(struct ScriptContext * ctx) { const u8 value1 = ctx->data[ScriptReadByte(ctx)]; const u8 value2 = *(const u8 *)ScriptReadWord(ctx); @@ -396,7 +394,7 @@ bool8 ScrCmd_compare_local_to_addr(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_compare_addr_to_local(struct ScriptContext *ctx) +bool8 ScrCmd_compare_addr_to_local(struct ScriptContext * ctx) { const u8 value1 = *(const u8 *)ScriptReadWord(ctx); const u8 value2 = ctx->data[ScriptReadByte(ctx)]; @@ -405,7 +403,7 @@ bool8 ScrCmd_compare_addr_to_local(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_compare_addr_to_value(struct ScriptContext *ctx) +bool8 ScrCmd_compare_addr_to_value(struct ScriptContext * ctx) { const u8 value1 = *(const u8 *)ScriptReadWord(ctx); const u8 value2 = ScriptReadByte(ctx); @@ -414,7 +412,7 @@ bool8 ScrCmd_compare_addr_to_value(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_compare_addr_to_addr(struct ScriptContext *ctx) +bool8 ScrCmd_compare_addr_to_addr(struct ScriptContext * ctx) { const u8 value1 = *(const u8 *)ScriptReadWord(ctx); const u8 value2 = *(const u8 *)ScriptReadWord(ctx); @@ -423,7 +421,7 @@ bool8 ScrCmd_compare_addr_to_addr(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_compare_var_to_value(struct ScriptContext *ctx) +bool8 ScrCmd_compare_var_to_value(struct ScriptContext * ctx) { const u16 value1 = *GetVarPointer(ScriptReadHalfword(ctx)); const u16 value2 = ScriptReadHalfword(ctx); @@ -432,7 +430,7 @@ bool8 ScrCmd_compare_var_to_value(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_compare_var_to_var(struct ScriptContext *ctx) +bool8 ScrCmd_compare_var_to_var(struct ScriptContext * ctx) { const u16 *ptr1 = GetVarPointer(ScriptReadHalfword(ctx)); const u16 *ptr2 = GetVarPointer(ScriptReadHalfword(ctx)); @@ -441,21 +439,21 @@ bool8 ScrCmd_compare_var_to_var(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_addvar(struct ScriptContext *ctx) +bool8 ScrCmd_addvar(struct ScriptContext * ctx) { u16 *ptr = GetVarPointer(ScriptReadHalfword(ctx)); *ptr += ScriptReadHalfword(ctx); return FALSE; } -bool8 ScrCmd_subvar(struct ScriptContext *ctx) +bool8 ScrCmd_subvar(struct ScriptContext * ctx) { u16 *ptr = GetVarPointer(ScriptReadHalfword(ctx)); *ptr -= VarGet(ScriptReadHalfword(ctx)); return FALSE; } -bool8 ScrCmd_random(struct ScriptContext *ctx) +bool8 ScrCmd_random(struct ScriptContext * ctx) { u16 max = VarGet(ScriptReadHalfword(ctx)); @@ -463,7 +461,7 @@ bool8 ScrCmd_random(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_additem(struct ScriptContext *ctx) +bool8 ScrCmd_additem(struct ScriptContext * ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u32 quantity = VarGet(ScriptReadHalfword(ctx)); @@ -473,7 +471,7 @@ bool8 ScrCmd_additem(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_removeitem(struct ScriptContext *ctx) +bool8 ScrCmd_removeitem(struct ScriptContext * ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u32 quantity = VarGet(ScriptReadHalfword(ctx)); @@ -482,7 +480,7 @@ bool8 ScrCmd_removeitem(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_checkitemspace(struct ScriptContext *ctx) +bool8 ScrCmd_checkitemspace(struct ScriptContext * ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u32 quantity = VarGet(ScriptReadHalfword(ctx)); @@ -491,7 +489,7 @@ bool8 ScrCmd_checkitemspace(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_checkitem(struct ScriptContext *ctx) +bool8 ScrCmd_checkitem(struct ScriptContext * ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u32 quantity = VarGet(ScriptReadHalfword(ctx)); @@ -500,7 +498,7 @@ bool8 ScrCmd_checkitem(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_checkitemtype(struct ScriptContext *ctx) +bool8 ScrCmd_checkitemtype(struct ScriptContext * ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); @@ -508,7 +506,7 @@ bool8 ScrCmd_checkitemtype(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_addpcitem(struct ScriptContext *ctx) +bool8 ScrCmd_addpcitem(struct ScriptContext * ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u16 quantity = VarGet(ScriptReadHalfword(ctx)); @@ -517,7 +515,7 @@ bool8 ScrCmd_addpcitem(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_checkpcitem(struct ScriptContext *ctx) +bool8 ScrCmd_checkpcitem(struct ScriptContext * ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u16 quantity = VarGet(ScriptReadHalfword(ctx)); @@ -526,7 +524,7 @@ bool8 ScrCmd_checkpcitem(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_givedecoration(struct ScriptContext *ctx) +bool8 ScrCmd_givedecoration(struct ScriptContext * ctx) { u32 decorId = VarGet(ScriptReadHalfword(ctx)); @@ -534,7 +532,7 @@ bool8 ScrCmd_givedecoration(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_takedecoration(struct ScriptContext *ctx) +bool8 ScrCmd_takedecoration(struct ScriptContext * ctx) { u32 decorId = VarGet(ScriptReadHalfword(ctx)); @@ -542,7 +540,7 @@ bool8 ScrCmd_takedecoration(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_checkdecorspace(struct ScriptContext *ctx) +bool8 ScrCmd_checkdecorspace(struct ScriptContext * ctx) { u32 decorId = VarGet(ScriptReadHalfword(ctx)); @@ -550,7 +548,7 @@ bool8 ScrCmd_checkdecorspace(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_checkdecor(struct ScriptContext *ctx) +bool8 ScrCmd_checkdecor(struct ScriptContext * ctx) { u32 decorId = VarGet(ScriptReadHalfword(ctx)); @@ -558,31 +556,31 @@ bool8 ScrCmd_checkdecor(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setflag(struct ScriptContext *ctx) +bool8 ScrCmd_setflag(struct ScriptContext * ctx) { FlagSet(ScriptReadHalfword(ctx)); return FALSE; } -bool8 ScrCmd_clearflag(struct ScriptContext *ctx) +bool8 ScrCmd_clearflag(struct ScriptContext * ctx) { FlagClear(ScriptReadHalfword(ctx)); return FALSE; } -bool8 ScrCmd_checkflag(struct ScriptContext *ctx) +bool8 ScrCmd_checkflag(struct ScriptContext * ctx) { ctx->comparisonResult = FlagGet(ScriptReadHalfword(ctx)); return FALSE; } -bool8 ScrCmd_incrementgamestat(struct ScriptContext *ctx) +bool8 ScrCmd_incrementgamestat(struct ScriptContext * ctx) { IncrementGameStat(ScriptReadByte(ctx)); return FALSE; } -bool8 ScrCmd_comparestattoword(struct ScriptContext *ctx) +bool8 ScrCmd_comparestattoword(struct ScriptContext * ctx) { u8 statIdx = ScriptReadByte(ctx); u32 value = ScriptReadWord(ctx); @@ -597,22 +595,22 @@ bool8 ScrCmd_comparestattoword(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setworldmapflag(struct ScriptContext *ctx) +bool8 ScrCmd_setworldmapflag(struct ScriptContext * ctx) { u16 value = ScriptReadHalfword(ctx); - sub_8115748(value); - sub_80F85BC(value); + QuestLog_RecordEnteredMap(value); + MapPreview_SetFlag(value); return FALSE; } -bool8 ScrCmd_animateflash(struct ScriptContext *ctx) +bool8 ScrCmd_animateflash(struct ScriptContext * ctx) { AnimateFlash(ScriptReadByte(ctx)); ScriptContext1_Stop(); return TRUE; } -bool8 ScrCmd_setflashradius(struct ScriptContext *ctx) +bool8 ScrCmd_setflashradius(struct ScriptContext * ctx) { u16 flashLevel = VarGet(ScriptReadHalfword(ctx)); @@ -628,14 +626,14 @@ static bool8 IsPaletteNotActive(void) return FALSE; } -bool8 ScrCmd_fadescreen(struct ScriptContext *ctx) +bool8 ScrCmd_fadescreen(struct ScriptContext * ctx) { FadeScreen(ScriptReadByte(ctx), 0); SetupNativeScript(ctx, IsPaletteNotActive); return TRUE; } -bool8 ScrCmd_fadescreenspeed(struct ScriptContext *ctx) +bool8 ScrCmd_fadescreenspeed(struct ScriptContext * ctx) { u8 mode = ScriptReadByte(ctx); u8 speed = ScriptReadByte(ctx); @@ -655,14 +653,14 @@ static bool8 RunPauseTimer(void) return FALSE; } -bool8 ScrCmd_delay(struct ScriptContext *ctx) +bool8 ScrCmd_delay(struct ScriptContext * ctx) { sPauseCounter = ScriptReadHalfword(ctx); SetupNativeScript(ctx, RunPauseTimer); return TRUE; } -bool8 ScrCmd_initclock(struct ScriptContext *ctx) +bool8 ScrCmd_initclock(struct ScriptContext * ctx) { // u8 hour = VarGet(ScriptReadHalfword(ctx)); // u8 minute = VarGet(ScriptReadHalfword(ctx)); @@ -671,13 +669,13 @@ bool8 ScrCmd_initclock(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_dodailyevents(struct ScriptContext *ctx) +bool8 ScrCmd_dodailyevents(struct ScriptContext * ctx) { // DoTimeBasedEvents(); return FALSE; } -bool8 ScrCmd_gettime(struct ScriptContext *ctx) +bool8 ScrCmd_gettime(struct ScriptContext * ctx) { // RtcCalcLocalTime(); // gSpecialVar_0x8000 = gLocalTime.hours; @@ -689,7 +687,7 @@ bool8 ScrCmd_gettime(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setweather(struct ScriptContext *ctx) +bool8 ScrCmd_setweather(struct ScriptContext * ctx) { u16 weather = VarGet(ScriptReadHalfword(ctx)); @@ -697,25 +695,25 @@ bool8 ScrCmd_setweather(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_resetweather(struct ScriptContext *ctx) +bool8 ScrCmd_resetweather(struct ScriptContext * ctx) { SetSav1WeatherFromCurrMapHeader(); return FALSE; } -bool8 ScrCmd_doweather(struct ScriptContext *ctx) +bool8 ScrCmd_doweather(struct ScriptContext * ctx) { DoCurrentWeather(); return FALSE; } -bool8 ScrCmd_setstepcallback(struct ScriptContext *ctx) +bool8 ScrCmd_setstepcallback(struct ScriptContext * ctx) { ActivatePerStepCallback(ScriptReadByte(ctx)); return FALSE; } -bool8 ScrCmd_setmaplayoutindex(struct ScriptContext *ctx) +bool8 ScrCmd_setmaplayoutindex(struct ScriptContext * ctx) { u16 value = VarGet(ScriptReadHalfword(ctx)); @@ -723,7 +721,7 @@ bool8 ScrCmd_setmaplayoutindex(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_warp(struct ScriptContext *ctx) +bool8 ScrCmd_warp(struct ScriptContext * ctx) { u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); @@ -737,7 +735,7 @@ bool8 ScrCmd_warp(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_warpsilent(struct ScriptContext *ctx) +bool8 ScrCmd_warpsilent(struct ScriptContext * ctx) { u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); @@ -751,7 +749,7 @@ bool8 ScrCmd_warpsilent(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_warpdoor(struct ScriptContext *ctx) +bool8 ScrCmd_warpdoor(struct ScriptContext * ctx) { u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); @@ -765,7 +763,7 @@ bool8 ScrCmd_warpdoor(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_warphole(struct ScriptContext *ctx) +bool8 ScrCmd_warphole(struct ScriptContext * ctx) { u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); @@ -782,7 +780,7 @@ bool8 ScrCmd_warphole(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_warpteleport(struct ScriptContext *ctx) +bool8 ScrCmd_warpteleport(struct ScriptContext * ctx) { u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); @@ -796,7 +794,7 @@ bool8 ScrCmd_warpteleport(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_warpteleport2(struct ScriptContext *ctx) +bool8 ScrCmd_warpteleport2(struct ScriptContext * ctx) { u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); @@ -811,7 +809,7 @@ bool8 ScrCmd_warpteleport2(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_setwarp(struct ScriptContext *ctx) +bool8 ScrCmd_setwarp(struct ScriptContext * ctx) { u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); @@ -823,7 +821,7 @@ bool8 ScrCmd_setwarp(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setdynamicwarp(struct ScriptContext *ctx) +bool8 ScrCmd_setdynamicwarp(struct ScriptContext * ctx) { u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); @@ -835,7 +833,7 @@ bool8 ScrCmd_setdynamicwarp(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setdivewarp(struct ScriptContext *ctx) +bool8 ScrCmd_setdivewarp(struct ScriptContext * ctx) { u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); @@ -847,7 +845,7 @@ bool8 ScrCmd_setdivewarp(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setholewarp(struct ScriptContext *ctx) +bool8 ScrCmd_setholewarp(struct ScriptContext * ctx) { u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); @@ -859,7 +857,7 @@ bool8 ScrCmd_setholewarp(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setescapewarp(struct ScriptContext *ctx) +bool8 ScrCmd_setescapewarp(struct ScriptContext * ctx) { u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); @@ -871,7 +869,7 @@ bool8 ScrCmd_setescapewarp(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_getplayerxy(struct ScriptContext *ctx) +bool8 ScrCmd_getplayerxy(struct ScriptContext * ctx) { u16 *pX = GetVarPointer(ScriptReadHalfword(ctx)); u16 *pY = GetVarPointer(ScriptReadHalfword(ctx)); @@ -881,13 +879,13 @@ bool8 ScrCmd_getplayerxy(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_getpartysize(struct ScriptContext *ctx) +bool8 ScrCmd_getpartysize(struct ScriptContext * ctx) { gSpecialVar_Result = CalculatePlayerPartyCount(); return FALSE; } -bool8 ScrCmd_playse(struct ScriptContext *ctx) +bool8 ScrCmd_playse(struct ScriptContext * ctx) { PlaySE(ScriptReadHalfword(ctx)); return FALSE; @@ -901,13 +899,13 @@ static bool8 WaitForSoundEffectFinish(void) return FALSE; } -bool8 ScrCmd_waitse(struct ScriptContext *ctx) +bool8 ScrCmd_waitse(struct ScriptContext * ctx) { SetupNativeScript(ctx, WaitForSoundEffectFinish); return TRUE; } -bool8 ScrCmd_playfanfare(struct ScriptContext *ctx) +bool8 ScrCmd_playfanfare(struct ScriptContext * ctx) { PlayFanfare(ScriptReadHalfword(ctx)); return FALSE; @@ -918,13 +916,13 @@ static bool8 WaitForFanfareFinish(void) return IsFanfareTaskInactive(); } -bool8 ScrCmd_waitfanfare(struct ScriptContext *ctx) +bool8 ScrCmd_waitfanfare(struct ScriptContext * ctx) { SetupNativeScript(ctx, WaitForFanfareFinish); return TRUE; } -bool8 ScrCmd_playbgm(struct ScriptContext *ctx) +bool8 ScrCmd_playbgm(struct ScriptContext * ctx) { u16 songId = ScriptReadHalfword(ctx); bool8 val = ScriptReadByte(ctx); @@ -937,13 +935,13 @@ bool8 ScrCmd_playbgm(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_savebgm(struct ScriptContext *ctx) +bool8 ScrCmd_savebgm(struct ScriptContext * ctx) { Overworld_SetSavedMusic(ScriptReadHalfword(ctx)); return FALSE; } -bool8 ScrCmd_fadedefaultbgm(struct ScriptContext *ctx) +bool8 ScrCmd_fadedefaultbgm(struct ScriptContext * ctx) { if (gQuestLogState == 2 || gQuestLogState == 3) return FALSE; @@ -951,7 +949,7 @@ bool8 ScrCmd_fadedefaultbgm(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_fadenewbgm(struct ScriptContext *ctx) +bool8 ScrCmd_fadenewbgm(struct ScriptContext * ctx) { u16 music = ScriptReadHalfword(ctx); if (gQuestLogState == 2 || gQuestLogState == 3) @@ -960,7 +958,7 @@ bool8 ScrCmd_fadenewbgm(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_fadeoutbgm(struct ScriptContext *ctx) +bool8 ScrCmd_fadeoutbgm(struct ScriptContext * ctx) { u8 speed = ScriptReadByte(ctx); @@ -974,7 +972,7 @@ bool8 ScrCmd_fadeoutbgm(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_fadeinbgm(struct ScriptContext *ctx) +bool8 ScrCmd_fadeinbgm(struct ScriptContext * ctx) { u8 speed = ScriptReadByte(ctx); @@ -987,7 +985,7 @@ bool8 ScrCmd_fadeinbgm(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_applymovement(struct ScriptContext *ctx) +bool8 ScrCmd_applymovement(struct ScriptContext * ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); const void *movementScript = (const void *)ScriptReadWord(ctx); @@ -997,7 +995,7 @@ bool8 ScrCmd_applymovement(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_applymovement_at(struct ScriptContext *ctx) +bool8 ScrCmd_applymovement_at(struct ScriptContext * ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); const void *movementScript = (const void *)ScriptReadWord(ctx); @@ -1014,7 +1012,7 @@ static bool8 WaitForMovementFinish(void) return ScriptMovement_IsObjectMovementFinished(sMovingNpcId, sMovingNpcMapId, sMovingNpcMapBank); } -bool8 ScrCmd_waitmovement(struct ScriptContext *ctx) +bool8 ScrCmd_waitmovement(struct ScriptContext * ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); @@ -1026,7 +1024,7 @@ bool8 ScrCmd_waitmovement(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_waitmovement_at(struct ScriptContext *ctx) +bool8 ScrCmd_waitmovement_at(struct ScriptContext * ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); u8 mapBank; @@ -1042,7 +1040,7 @@ bool8 ScrCmd_waitmovement_at(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_removeobject(struct ScriptContext *ctx) +bool8 ScrCmd_removeobject(struct ScriptContext * ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); @@ -1050,7 +1048,7 @@ bool8 ScrCmd_removeobject(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_removeobject_at(struct ScriptContext *ctx) +bool8 ScrCmd_removeobject_at(struct ScriptContext * ctx) { u16 objectId = VarGet(ScriptReadHalfword(ctx)); u8 mapGroup = ScriptReadByte(ctx); @@ -1060,7 +1058,7 @@ bool8 ScrCmd_removeobject_at(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_addobject(struct ScriptContext *ctx) +bool8 ScrCmd_addobject(struct ScriptContext * ctx) { u16 objectId = VarGet(ScriptReadHalfword(ctx)); @@ -1068,7 +1066,7 @@ bool8 ScrCmd_addobject(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_addobject_at(struct ScriptContext *ctx) +bool8 ScrCmd_addobject_at(struct ScriptContext * ctx) { u16 objectId = VarGet(ScriptReadHalfword(ctx)); u8 mapGroup = ScriptReadByte(ctx); @@ -1078,7 +1076,7 @@ bool8 ScrCmd_addobject_at(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setobjectxy(struct ScriptContext *ctx) +bool8 ScrCmd_setobjectxy(struct ScriptContext * ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); u16 x = VarGet(ScriptReadHalfword(ctx)); @@ -1088,7 +1086,7 @@ bool8 ScrCmd_setobjectxy(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setobjectxyperm(struct ScriptContext *ctx) +bool8 ScrCmd_setobjectxyperm(struct ScriptContext * ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); u16 x = VarGet(ScriptReadHalfword(ctx)); @@ -1098,7 +1096,7 @@ bool8 ScrCmd_setobjectxyperm(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_moveobjectoffscreen(struct ScriptContext *ctx) +bool8 ScrCmd_moveobjectoffscreen(struct ScriptContext * ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); @@ -1106,7 +1104,7 @@ bool8 ScrCmd_moveobjectoffscreen(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_showobject_at(struct ScriptContext *ctx) +bool8 ScrCmd_showobject_at(struct ScriptContext * ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); u8 mapGroup = ScriptReadByte(ctx); @@ -1116,7 +1114,7 @@ bool8 ScrCmd_showobject_at(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_hideobject_at(struct ScriptContext *ctx) +bool8 ScrCmd_hideobject_at(struct ScriptContext * ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); u8 mapGroup = ScriptReadByte(ctx); @@ -1126,7 +1124,7 @@ bool8 ScrCmd_hideobject_at(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setobjectpriority(struct ScriptContext *ctx) +bool8 ScrCmd_setobjectpriority(struct ScriptContext * ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); u8 mapGroup = ScriptReadByte(ctx); @@ -1137,7 +1135,7 @@ bool8 ScrCmd_setobjectpriority(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_resetobjectpriority(struct ScriptContext *ctx) +bool8 ScrCmd_resetobjectpriority(struct ScriptContext * ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); u8 mapGroup = ScriptReadByte(ctx); @@ -1147,7 +1145,7 @@ bool8 ScrCmd_resetobjectpriority(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_faceplayer(struct ScriptContext *ctx) +bool8 ScrCmd_faceplayer(struct ScriptContext * ctx) { if (gObjectEvents[gSelectedObjectEvent].active) { @@ -1157,7 +1155,7 @@ bool8 ScrCmd_faceplayer(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_turnobject(struct ScriptContext *ctx) +bool8 ScrCmd_turnobject(struct ScriptContext * ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); u8 direction = ScriptReadByte(ctx); @@ -1166,7 +1164,7 @@ bool8 ScrCmd_turnobject(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setobjectmovementtype(struct ScriptContext *ctx) +bool8 ScrCmd_setobjectmovementtype(struct ScriptContext * ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); u8 movementType = ScriptReadByte(ctx); @@ -1175,7 +1173,7 @@ bool8 ScrCmd_setobjectmovementtype(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_createvobject(struct ScriptContext *ctx) +bool8 ScrCmd_createvobject(struct ScriptContext * ctx) { u8 graphicsId = ScriptReadByte(ctx); u8 v2 = ScriptReadByte(ctx); @@ -1188,16 +1186,16 @@ bool8 ScrCmd_createvobject(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_turnvobject(struct ScriptContext *ctx) +bool8 ScrCmd_turnvobject(struct ScriptContext * ctx) { u8 v1 = ScriptReadByte(ctx); u8 direction = ScriptReadByte(ctx); - sub_8069058(v1, direction); + TurnObjectEvent(v1, direction); return FALSE; } -bool8 ScrCmd_lockall(struct ScriptContext *ctx) +bool8 ScrCmd_lockall(struct ScriptContext * ctx) { if (IsUpdateLinkStateCBActive()) { @@ -1211,7 +1209,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx) } } -bool8 ScrCmd_lock(struct ScriptContext *ctx) +bool8 ScrCmd_lock(struct ScriptContext * ctx) { if (IsUpdateLinkStateCBActive()) { @@ -1233,19 +1231,19 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx) } } -bool8 ScrCmd_releaseall(struct ScriptContext *ctx) +bool8 ScrCmd_releaseall(struct ScriptContext * ctx) { u8 playerObjectId; HideFieldMessageBox(); playerObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); - sub_80974D8(); + ScriptMovement_UnfreezeObjectEvents(); UnfreezeObjectEvents(); return FALSE; } -bool8 ScrCmd_release(struct ScriptContext *ctx) +bool8 ScrCmd_release(struct ScriptContext * ctx) { u8 playerObjectId; @@ -1254,19 +1252,19 @@ bool8 ScrCmd_release(struct ScriptContext *ctx) ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); playerObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); - sub_80974D8(); + ScriptMovement_UnfreezeObjectEvents(); UnfreezeObjectEvents(); return FALSE; } -bool8 ScrCmd_textcolor(struct ScriptContext *ctx) +bool8 ScrCmd_textcolor(struct ScriptContext * ctx) { gSpecialVar_PrevTextColor = gSpecialVar_TextColor; gSpecialVar_TextColor = ScriptReadByte(ctx); return FALSE; } -bool8 ScrCmd_message(struct ScriptContext *ctx) +bool8 ScrCmd_message(struct ScriptContext * ctx) { const u8 *msg = (const u8 *)ScriptReadWord(ctx); @@ -1276,7 +1274,7 @@ bool8 ScrCmd_message(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_loadhelp(struct ScriptContext *ctx) +bool8 ScrCmd_loadhelp(struct ScriptContext * ctx) { const u8 *msg = (const u8 *)ScriptReadWord(ctx); @@ -1287,13 +1285,13 @@ bool8 ScrCmd_loadhelp(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_unloadhelp(struct ScriptContext *ctx) +bool8 ScrCmd_unloadhelp(struct ScriptContext * ctx) { DestroyHelpMessageWindow_(); return FALSE; } -bool8 ScrCmd_messageautoscroll(struct ScriptContext *ctx) +bool8 ScrCmd_messageautoscroll(struct ScriptContext * ctx) { const u8 *msg = (const u8 *)ScriptReadWord(ctx); @@ -1303,13 +1301,13 @@ bool8 ScrCmd_messageautoscroll(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_waitmessage(struct ScriptContext *ctx) +bool8 ScrCmd_waitmessage(struct ScriptContext * ctx) { SetupNativeScript(ctx, IsFieldMessageBoxHidden); return TRUE; } -bool8 ScrCmd_closemessage(struct ScriptContext *ctx) +bool8 ScrCmd_closemessage(struct ScriptContext * ctx) { HideFieldMessageBox(); return FALSE; @@ -1403,7 +1401,7 @@ static u8 sub_806B96C(struct ScriptContext * ctx) return 0; } -bool8 ScrCmd_waitbuttonpress(struct ScriptContext *ctx) +bool8 ScrCmd_waitbuttonpress(struct ScriptContext * ctx) { gUnknown_3005070 = ctx; @@ -1413,7 +1411,7 @@ bool8 ScrCmd_waitbuttonpress(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_yesnobox(struct ScriptContext *ctx) +bool8 ScrCmd_yesnobox(struct ScriptContext * ctx) { u8 left = ScriptReadByte(ctx); u8 top = ScriptReadByte(ctx); @@ -1429,7 +1427,7 @@ bool8 ScrCmd_yesnobox(struct ScriptContext *ctx) } } -bool8 ScrCmd_multichoice(struct ScriptContext *ctx) +bool8 ScrCmd_multichoice(struct ScriptContext * ctx) { u8 left = ScriptReadByte(ctx); u8 top = ScriptReadByte(ctx); @@ -1447,7 +1445,7 @@ bool8 ScrCmd_multichoice(struct ScriptContext *ctx) } } -bool8 ScrCmd_multichoicedefault(struct ScriptContext *ctx) +bool8 ScrCmd_multichoicedefault(struct ScriptContext * ctx) { u8 left = ScriptReadByte(ctx); u8 top = ScriptReadByte(ctx); @@ -1466,7 +1464,7 @@ bool8 ScrCmd_multichoicedefault(struct ScriptContext *ctx) } } -bool8 ScrCmd_drawbox(struct ScriptContext *ctx) +bool8 ScrCmd_drawbox(struct ScriptContext * ctx) { /*u8 left = ScriptReadByte(ctx); u8 top = ScriptReadByte(ctx); @@ -1477,7 +1475,7 @@ bool8 ScrCmd_drawbox(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_multichoicegrid(struct ScriptContext *ctx) +bool8 ScrCmd_multichoicegrid(struct ScriptContext * ctx) { u8 left = ScriptReadByte(ctx); u8 top = ScriptReadByte(ctx); @@ -1496,7 +1494,7 @@ bool8 ScrCmd_multichoicegrid(struct ScriptContext *ctx) } } -bool8 ScrCmd_erasebox(struct ScriptContext *ctx) +bool8 ScrCmd_erasebox(struct ScriptContext * ctx) { u8 left = ScriptReadByte(ctx); u8 top = ScriptReadByte(ctx); @@ -1507,7 +1505,7 @@ bool8 ScrCmd_erasebox(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_drawboxtext(struct ScriptContext *ctx) +bool8 ScrCmd_drawboxtext(struct ScriptContext * ctx) { // u8 left = ScriptReadByte(ctx); // u8 top = ScriptReadByte(ctx); @@ -1522,7 +1520,7 @@ bool8 ScrCmd_drawboxtext(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_showmonpic(struct ScriptContext *ctx) +bool8 ScrCmd_showmonpic(struct ScriptContext * ctx) { u16 species = VarGet(ScriptReadHalfword(ctx)); u8 x = ScriptReadByte(ctx); @@ -1533,7 +1531,7 @@ bool8 ScrCmd_showmonpic(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_hidemonpic(struct ScriptContext *ctx) +bool8 ScrCmd_hidemonpic(struct ScriptContext * ctx) { bool8 (*func)(void) = ScriptMenu_GetPicboxWaitFunc(); @@ -1543,7 +1541,7 @@ bool8 ScrCmd_hidemonpic(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_showcontestwinner(struct ScriptContext *ctx) +bool8 ScrCmd_showcontestwinner(struct ScriptContext * ctx) { u8 v1 = ScriptReadByte(ctx); @@ -1558,7 +1556,7 @@ bool8 ScrCmd_showcontestwinner(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) +bool8 ScrCmd_braillemessage(struct ScriptContext * ctx) { u8 *ptr = (u8 *)ScriptReadWord(ctx); if (ptr == NULL) @@ -1570,7 +1568,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_getbraillestringwidth(struct ScriptContext *ctx) +bool8 ScrCmd_getbraillestringwidth(struct ScriptContext * ctx) { u8 *ptr = (u8 *)ScriptReadWord(ctx); if (ptr == NULL) @@ -1580,7 +1578,7 @@ bool8 ScrCmd_getbraillestringwidth(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_vmessage(struct ScriptContext *ctx) +bool8 ScrCmd_vmessage(struct ScriptContext * ctx) { u32 v1 = ScriptReadWord(ctx); @@ -1588,14 +1586,14 @@ bool8 ScrCmd_vmessage(struct ScriptContext *ctx) return FALSE; } -u8 * const sScriptStringVars[] = +u8 *const sScriptStringVars[] = { gStringVar1, gStringVar2, gStringVar3, }; -bool8 ScrCmd_bufferspeciesname(struct ScriptContext *ctx) +bool8 ScrCmd_bufferspeciesname(struct ScriptContext * ctx) { u8 stringVarIndex = ScriptReadByte(ctx); u16 species = VarGet(ScriptReadHalfword(ctx)); @@ -1604,7 +1602,7 @@ bool8 ScrCmd_bufferspeciesname(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_bufferleadmonspeciesname(struct ScriptContext *ctx) +bool8 ScrCmd_bufferleadmonspeciesname(struct ScriptContext * ctx) { u8 stringVarIndex = ScriptReadByte(ctx); @@ -1615,7 +1613,7 @@ bool8 ScrCmd_bufferleadmonspeciesname(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_bufferpartymonnick(struct ScriptContext *ctx) +bool8 ScrCmd_bufferpartymonnick(struct ScriptContext * ctx) { u8 stringVarIndex = ScriptReadByte(ctx); u16 partyIndex = VarGet(ScriptReadHalfword(ctx)); @@ -1625,7 +1623,7 @@ bool8 ScrCmd_bufferpartymonnick(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_bufferitemname(struct ScriptContext *ctx) +bool8 ScrCmd_bufferitemname(struct ScriptContext * ctx) { u8 stringVarIndex = ScriptReadByte(ctx); u16 itemId = VarGet(ScriptReadHalfword(ctx)); @@ -1637,7 +1635,7 @@ bool8 ScrCmd_bufferitemname(struct ScriptContext *ctx) const u8 gUnknown_83A72A0[] = _("S"); const u8 gUnknown_83A72A2[] = _("IES"); -bool8 ScrCmd_bufferitemnameplural(struct ScriptContext *ctx) +bool8 ScrCmd_bufferitemnameplural(struct ScriptContext * ctx) { u8 stringVarIndex = ScriptReadByte(ctx); u16 itemId = VarGet(ScriptReadHalfword(ctx)); @@ -1660,7 +1658,7 @@ bool8 ScrCmd_bufferitemnameplural(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_bufferdecorationname(struct ScriptContext *ctx) +bool8 ScrCmd_bufferdecorationname(struct ScriptContext * ctx) { u8 stringVarIndex = ScriptReadByte(ctx); u16 decorId = VarGet(ScriptReadHalfword(ctx)); @@ -1669,7 +1667,7 @@ bool8 ScrCmd_bufferdecorationname(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_buffermovename(struct ScriptContext *ctx) +bool8 ScrCmd_buffermovename(struct ScriptContext * ctx) { u8 stringVarIndex = ScriptReadByte(ctx); u16 moveId = VarGet(ScriptReadHalfword(ctx)); @@ -1678,7 +1676,7 @@ bool8 ScrCmd_buffermovename(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_buffernumberstring(struct ScriptContext *ctx) +bool8 ScrCmd_buffernumberstring(struct ScriptContext * ctx) { u8 stringVarIndex = ScriptReadByte(ctx); u16 v1 = VarGet(ScriptReadHalfword(ctx)); @@ -1688,7 +1686,7 @@ bool8 ScrCmd_buffernumberstring(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_bufferstdstring(struct ScriptContext *ctx) +bool8 ScrCmd_bufferstdstring(struct ScriptContext * ctx) { u8 stringVarIndex = ScriptReadByte(ctx); u16 index = VarGet(ScriptReadHalfword(ctx)); @@ -1698,7 +1696,7 @@ bool8 ScrCmd_bufferstdstring(struct ScriptContext *ctx) } /* -bool8 ScrCmd_buffercontesttype(struct ScriptContext *ctx) +bool8 ScrCmd_buffercontesttype(struct ScriptContext * ctx) { u8 stringVarIndex = ScriptReadByte(ctx); u16 index = VarGet(ScriptReadHalfword(ctx)); @@ -1708,7 +1706,7 @@ bool8 ScrCmd_buffercontesttype(struct ScriptContext *ctx) } */ -bool8 ScrCmd_bufferstring(struct ScriptContext *ctx) +bool8 ScrCmd_bufferstring(struct ScriptContext * ctx) { u8 stringVarIndex = ScriptReadByte(ctx); const u8 *text = (u8 *)ScriptReadWord(ctx); @@ -1717,7 +1715,7 @@ bool8 ScrCmd_bufferstring(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_vloadword(struct ScriptContext *ctx) +bool8 ScrCmd_vloadword(struct ScriptContext * ctx) { const u8 *ptr = (u8 *)(ScriptReadWord(ctx) - gVScriptOffset); @@ -1725,7 +1723,7 @@ bool8 ScrCmd_vloadword(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_vbufferstring(struct ScriptContext *ctx) +bool8 ScrCmd_vbufferstring(struct ScriptContext * ctx) { u8 stringVarIndex = ScriptReadByte(ctx); u32 addr = ScriptReadWord(ctx); @@ -1736,7 +1734,7 @@ bool8 ScrCmd_vbufferstring(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_bufferboxname(struct ScriptContext *ctx) +bool8 ScrCmd_bufferboxname(struct ScriptContext * ctx) { u8 stringVarIndex = ScriptReadByte(ctx); u16 boxId = VarGet(ScriptReadHalfword(ctx)); @@ -1745,7 +1743,7 @@ bool8 ScrCmd_bufferboxname(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_givemon(struct ScriptContext *ctx) +bool8 ScrCmd_givemon(struct ScriptContext * ctx) { u16 species = VarGet(ScriptReadHalfword(ctx)); u8 level = ScriptReadByte(ctx); @@ -1758,7 +1756,7 @@ bool8 ScrCmd_givemon(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_giveegg(struct ScriptContext *ctx) +bool8 ScrCmd_giveegg(struct ScriptContext * ctx) { u16 species = VarGet(ScriptReadHalfword(ctx)); @@ -1766,7 +1764,7 @@ bool8 ScrCmd_giveegg(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setmonmove(struct ScriptContext *ctx) +bool8 ScrCmd_setmonmove(struct ScriptContext * ctx) { u8 partyIndex = ScriptReadByte(ctx); u8 slot = ScriptReadByte(ctx); @@ -1776,7 +1774,7 @@ bool8 ScrCmd_setmonmove(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_checkpartymove(struct ScriptContext *ctx) +bool8 ScrCmd_checkpartymove(struct ScriptContext * ctx) { u8 i; u16 moveId = ScriptReadHalfword(ctx); @@ -1797,7 +1795,7 @@ bool8 ScrCmd_checkpartymove(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_addmoney(struct ScriptContext *ctx) +bool8 ScrCmd_addmoney(struct ScriptContext * ctx) { u32 amount = ScriptReadWord(ctx); u8 ignore = ScriptReadByte(ctx); @@ -1807,7 +1805,7 @@ bool8 ScrCmd_addmoney(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_removemoney(struct ScriptContext *ctx) +bool8 ScrCmd_removemoney(struct ScriptContext * ctx) { u32 amount = ScriptReadWord(ctx); u8 ignore = ScriptReadByte(ctx); @@ -1817,7 +1815,7 @@ bool8 ScrCmd_removemoney(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_checkmoney(struct ScriptContext *ctx) +bool8 ScrCmd_checkmoney(struct ScriptContext * ctx) { u32 amount = ScriptReadWord(ctx); u8 ignore = ScriptReadByte(ctx); @@ -1827,7 +1825,7 @@ bool8 ScrCmd_checkmoney(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_showmoneybox(struct ScriptContext *ctx) +bool8 ScrCmd_showmoneybox(struct ScriptContext * ctx) { u8 x = ScriptReadByte(ctx); u8 y = ScriptReadByte(ctx); @@ -1838,7 +1836,7 @@ bool8 ScrCmd_showmoneybox(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_hidemoneybox(struct ScriptContext *ctx) +bool8 ScrCmd_hidemoneybox(struct ScriptContext * ctx) { /*u8 x = ScriptReadByte(ctx); u8 y = ScriptReadByte(ctx);*/ @@ -1847,7 +1845,7 @@ bool8 ScrCmd_hidemoneybox(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_updatemoneybox(struct ScriptContext *ctx) +bool8 ScrCmd_updatemoneybox(struct ScriptContext * ctx) { u8 x = ScriptReadByte(ctx); u8 y = ScriptReadByte(ctx); @@ -1858,7 +1856,7 @@ bool8 ScrCmd_updatemoneybox(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_showcoinsbox(struct ScriptContext *ctx) +bool8 ScrCmd_showcoinsbox(struct ScriptContext * ctx) { u8 x = ScriptReadByte(ctx); u8 y = ScriptReadByte(ctx); @@ -1868,7 +1866,7 @@ bool8 ScrCmd_showcoinsbox(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_hidecoinsbox(struct ScriptContext *ctx) +bool8 ScrCmd_hidecoinsbox(struct ScriptContext * ctx) { u8 x = ScriptReadByte(ctx); u8 y = ScriptReadByte(ctx); @@ -1877,7 +1875,7 @@ bool8 ScrCmd_hidecoinsbox(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_updatecoinsbox(struct ScriptContext *ctx) +bool8 ScrCmd_updatecoinsbox(struct ScriptContext * ctx) { u8 x = ScriptReadByte(ctx); u8 y = ScriptReadByte(ctx); @@ -1886,31 +1884,31 @@ bool8 ScrCmd_updatecoinsbox(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_trainerbattle(struct ScriptContext *ctx) +bool8 ScrCmd_trainerbattle(struct ScriptContext * ctx) { ctx->scriptPtr = BattleSetup_ConfigureTrainerBattle(ctx->scriptPtr); return FALSE; } -bool8 ScrCmd_dotrainerbattle(struct ScriptContext *ctx) +bool8 ScrCmd_dotrainerbattle(struct ScriptContext * ctx) { - BattleSetup_StartTrainerBattle(); + StartTrainerBattle(); return TRUE; } -bool8 ScrCmd_gotopostbattlescript(struct ScriptContext *ctx) +bool8 ScrCmd_gotopostbattlescript(struct ScriptContext * ctx) { ctx->scriptPtr = BattleSetup_GetScriptAddrAfterBattle(); return FALSE; } -bool8 ScrCmd_gotobeatenscript(struct ScriptContext *ctx) +bool8 ScrCmd_gotobeatenscript(struct ScriptContext * ctx) { ctx->scriptPtr = BattleSetup_GetTrainerPostBattleScript(); return FALSE; } -bool8 ScrCmd_checktrainerflag(struct ScriptContext *ctx) +bool8 ScrCmd_checktrainerflag(struct ScriptContext * ctx) { u16 index = VarGet(ScriptReadHalfword(ctx)); @@ -1918,7 +1916,7 @@ bool8 ScrCmd_checktrainerflag(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_settrainerflag(struct ScriptContext *ctx) +bool8 ScrCmd_settrainerflag(struct ScriptContext * ctx) { u16 index = VarGet(ScriptReadHalfword(ctx)); @@ -1926,7 +1924,7 @@ bool8 ScrCmd_settrainerflag(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_cleartrainerflag(struct ScriptContext *ctx) +bool8 ScrCmd_cleartrainerflag(struct ScriptContext * ctx) { u16 index = VarGet(ScriptReadHalfword(ctx)); @@ -1934,7 +1932,7 @@ bool8 ScrCmd_cleartrainerflag(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx) +bool8 ScrCmd_setwildbattle(struct ScriptContext * ctx) { u16 species = ScriptReadHalfword(ctx); u8 level = ScriptReadByte(ctx); @@ -1944,14 +1942,14 @@ bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_dowildbattle(struct ScriptContext *ctx) +bool8 ScrCmd_dowildbattle(struct ScriptContext * ctx) { - BattleSetup_StartScriptedWildBattle(); + StartScriptedWildBattle(); ScriptContext1_Stop(); return TRUE; } -bool8 ScrCmd_pokemart(struct ScriptContext *ctx) +bool8 ScrCmd_pokemart(struct ScriptContext * ctx) { const void *ptr = (void *)ScriptReadWord(ctx); @@ -1960,7 +1958,7 @@ bool8 ScrCmd_pokemart(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_pokemartdecoration(struct ScriptContext *ctx) +bool8 ScrCmd_pokemartdecoration(struct ScriptContext * ctx) { const void *ptr = (void *)ScriptReadWord(ctx); @@ -1969,7 +1967,7 @@ bool8 ScrCmd_pokemartdecoration(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_pokemartdecoration2(struct ScriptContext *ctx) +bool8 ScrCmd_pokemartdecoration2(struct ScriptContext * ctx) { const void *ptr = (void *)ScriptReadWord(ctx); @@ -1978,7 +1976,7 @@ bool8 ScrCmd_pokemartdecoration2(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_playslotmachine(struct ScriptContext *ctx) +bool8 ScrCmd_playslotmachine(struct ScriptContext * ctx) { u8 slotMachineIndex = VarGet(ScriptReadHalfword(ctx)); @@ -1987,7 +1985,7 @@ bool8 ScrCmd_playslotmachine(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_setberrytree(struct ScriptContext *ctx) +bool8 ScrCmd_setberrytree(struct ScriptContext * ctx) { // u8 treeId = ScriptReadByte(ctx); // u8 berry = ScriptReadByte(ctx); @@ -2000,7 +1998,7 @@ bool8 ScrCmd_setberrytree(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_getpricereduction(struct ScriptContext *ctx) +bool8 ScrCmd_getpricereduction(struct ScriptContext * ctx) { // u16 value = VarGet(ScriptReadHalfword(ctx)); // @@ -2008,7 +2006,7 @@ bool8 ScrCmd_getpricereduction(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_choosecontestmon(struct ScriptContext *ctx) +bool8 ScrCmd_choosecontestmon(struct ScriptContext * ctx) { // sub_81B9404(); ScriptContext1_Stop(); @@ -2016,7 +2014,7 @@ bool8 ScrCmd_choosecontestmon(struct ScriptContext *ctx) } -bool8 ScrCmd_startcontest(struct ScriptContext *ctx) +bool8 ScrCmd_startcontest(struct ScriptContext * ctx) { // sub_80F840C(); // ScriptContext1_Stop(); @@ -2024,7 +2022,7 @@ bool8 ScrCmd_startcontest(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_showcontestresults(struct ScriptContext *ctx) +bool8 ScrCmd_showcontestresults(struct ScriptContext * ctx) { // sub_80F8484(); // ScriptContext1_Stop(); @@ -2032,7 +2030,7 @@ bool8 ScrCmd_showcontestresults(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_contestlinktransfer(struct ScriptContext *ctx) +bool8 ScrCmd_contestlinktransfer(struct ScriptContext * ctx) { // sub_80F84C4(gSpecialVar_ContestCategory); // ScriptContext1_Stop(); @@ -2040,7 +2038,7 @@ bool8 ScrCmd_contestlinktransfer(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_dofieldeffect(struct ScriptContext *ctx) +bool8 ScrCmd_dofieldeffect(struct ScriptContext * ctx) { u16 effectId = VarGet(ScriptReadHalfword(ctx)); @@ -2049,7 +2047,7 @@ bool8 ScrCmd_dofieldeffect(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setfieldeffectarg(struct ScriptContext *ctx) +bool8 ScrCmd_setfieldeffectarg(struct ScriptContext * ctx) { u8 argNum = ScriptReadByte(ctx); @@ -2065,14 +2063,14 @@ static bool8 WaitForFieldEffectFinish(void) return FALSE; } -bool8 ScrCmd_waitfieldeffect(struct ScriptContext *ctx) +bool8 ScrCmd_waitfieldeffect(struct ScriptContext * ctx) { sFieldEffectScriptId = VarGet(ScriptReadHalfword(ctx)); SetupNativeScript(ctx, WaitForFieldEffectFinish); return TRUE; } -bool8 ScrCmd_setrespawn(struct ScriptContext *ctx) +bool8 ScrCmd_setrespawn(struct ScriptContext * ctx) { u16 healLocationId = VarGet(ScriptReadHalfword(ctx)); @@ -2080,13 +2078,13 @@ bool8 ScrCmd_setrespawn(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_checkplayergender(struct ScriptContext *ctx) +bool8 ScrCmd_checkplayergender(struct ScriptContext * ctx) { gSpecialVar_Result = gSaveBlock2Ptr->playerGender; return FALSE; } -bool8 ScrCmd_playmoncry(struct ScriptContext *ctx) +bool8 ScrCmd_playmoncry(struct ScriptContext * ctx) { u16 species = VarGet(ScriptReadHalfword(ctx)); u16 mode = VarGet(ScriptReadHalfword(ctx)); @@ -2095,13 +2093,13 @@ bool8 ScrCmd_playmoncry(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_waitmoncry(struct ScriptContext *ctx) +bool8 ScrCmd_waitmoncry(struct ScriptContext * ctx) { SetupNativeScript(ctx, IsCryFinished); return TRUE; } -bool8 ScrCmd_setmetatile(struct ScriptContext *ctx) +bool8 ScrCmd_setmetatile(struct ScriptContext * ctx) { u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); @@ -2113,11 +2111,11 @@ bool8 ScrCmd_setmetatile(struct ScriptContext *ctx) if (!v8) MapGridSetMetatileIdAt(x, y, tileId); else - MapGridSetMetatileIdAt(x, y, tileId | 0xC00); + MapGridSetMetatileIdAt(x, y, tileId | METATILE_COLLISION_MASK); return FALSE; } -bool8 ScrCmd_opendoor(struct ScriptContext *ctx) +bool8 ScrCmd_opendoor(struct ScriptContext * ctx) { u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); @@ -2129,7 +2127,7 @@ bool8 ScrCmd_opendoor(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_closedoor(struct ScriptContext *ctx) +bool8 ScrCmd_closedoor(struct ScriptContext * ctx) { u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); @@ -2148,13 +2146,13 @@ static bool8 IsDoorAnimationStopped(void) return FALSE; } -bool8 ScrCmd_waitdooranim(struct ScriptContext *ctx) +bool8 ScrCmd_waitdooranim(struct ScriptContext * ctx) { SetupNativeScript(ctx, IsDoorAnimationStopped); return TRUE; } -bool8 ScrCmd_setdooropen(struct ScriptContext *ctx) +bool8 ScrCmd_setdooropen(struct ScriptContext * ctx) { u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); @@ -2165,7 +2163,7 @@ bool8 ScrCmd_setdooropen(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setdoorclosed(struct ScriptContext *ctx) +bool8 ScrCmd_setdoorclosed(struct ScriptContext * ctx) { u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); @@ -2176,7 +2174,7 @@ bool8 ScrCmd_setdoorclosed(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_addelevmenuitem(struct ScriptContext *ctx) +bool8 ScrCmd_addelevmenuitem(struct ScriptContext * ctx) { // u8 v3 = ScriptReadByte(ctx); // u16 v5 = VarGet(ScriptReadHalfword(ctx)); @@ -2187,7 +2185,7 @@ bool8 ScrCmd_addelevmenuitem(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_showelevmenu(struct ScriptContext *ctx) +bool8 ScrCmd_showelevmenu(struct ScriptContext * ctx) { /*ScriptShowElevatorMenu(); ScriptContext1_Stop(); @@ -2195,14 +2193,14 @@ bool8 ScrCmd_showelevmenu(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_checkcoins(struct ScriptContext *ctx) +bool8 ScrCmd_checkcoins(struct ScriptContext * ctx) { u16 *ptr = GetVarPointer(ScriptReadHalfword(ctx)); *ptr = GetCoins(); return FALSE; } -bool8 ScrCmd_addcoins(struct ScriptContext *ctx) +bool8 ScrCmd_addcoins(struct ScriptContext * ctx) { u16 coins = VarGet(ScriptReadHalfword(ctx)); @@ -2213,7 +2211,7 @@ bool8 ScrCmd_addcoins(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_removecoins(struct ScriptContext *ctx) +bool8 ScrCmd_removecoins(struct ScriptContext * ctx) { u16 coins = VarGet(ScriptReadHalfword(ctx)); @@ -2224,20 +2222,20 @@ bool8 ScrCmd_removecoins(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_signmsg(struct ScriptContext *ctx) +bool8 ScrCmd_signmsg(struct ScriptContext * ctx) { sub_8069A20(); return FALSE; } -bool8 ScrCmd_normalmsg(struct ScriptContext *ctx) +bool8 ScrCmd_normalmsg(struct ScriptContext * ctx) { sub_8069A2C(); return FALSE; } // This command will force the Pokémon to be obedient, you don't get to make it disobedient. -bool8 ScrCmd_setmonobedient(struct ScriptContext *ctx) +bool8 ScrCmd_setmonobedient(struct ScriptContext * ctx) { bool8 obedient = TRUE; u16 partyIndex = VarGet(ScriptReadHalfword(ctx)); @@ -2246,7 +2244,7 @@ bool8 ScrCmd_setmonobedient(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_checkmonobedience(struct ScriptContext *ctx) +bool8 ScrCmd_checkmonobedience(struct ScriptContext * ctx) { u16 partyIndex = VarGet(ScriptReadHalfword(ctx)); @@ -2254,7 +2252,7 @@ bool8 ScrCmd_checkmonobedience(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setmonmetlocation(struct ScriptContext *ctx) +bool8 ScrCmd_setmonmetlocation(struct ScriptContext * ctx) { u16 partyIndex = VarGet(ScriptReadHalfword(ctx)); u8 location = ScriptReadByte(ctx); |