Skip to content

Commit

Permalink
Revert change to ScrCmd_018
Browse files Browse the repository at this point in the history
  • Loading branch information
lhearachel committed Nov 4, 2024
1 parent acb1645 commit c2e3c80
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion asm/macros/scrcmd.inc
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
.long \arg1-.-4
.endm

.macro ScrCmd_Unused018 arg0, arg1
.macro ScrCmd_018 arg0, arg1
.short 24
.byte \arg0
.long \arg1-.-4
Expand Down
6 changes: 3 additions & 3 deletions src/scrcmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ static BOOL ScrCmd_ReturnCommonScript(ScriptContext *ctx);
static BOOL ScrCmd_GoTo(ScriptContext *ctx);
static MapObject *sub_02040ED4(FieldSystem *fieldSystem, int param1);
static BOOL ScrCmd_017(ScriptContext *ctx);
static BOOL ScrCmd_Unused018(ScriptContext *ctx);
static BOOL ScrCmd_018(ScriptContext *ctx);
static BOOL ScrCmd_019(ScriptContext *ctx);
static BOOL ScrCmd_Call(ScriptContext *ctx);
static BOOL ScrCmd_Return(ScriptContext *ctx);
Expand Down Expand Up @@ -787,7 +787,7 @@ const ScrCmdFunc Unk_020EAC58[] = {
ScrCmd_ReturnCommonScript,
ScrCmd_GoTo,
ScrCmd_017,
ScrCmd_Unused018,
ScrCmd_018,
ScrCmd_019,
ScrCmd_Call,
ScrCmd_Return,
Expand Down Expand Up @@ -1896,7 +1896,7 @@ static BOOL ScrCmd_017(ScriptContext *ctx)
return 0;
}

static BOOL ScrCmd_Unused018(ScriptContext *ctx)
static BOOL ScrCmd_018(ScriptContext *ctx)
{
u32 taskVal = FieldTask_GetDummy1CVal(ctx->task);
u8 val = ScriptContext_ReadByte(ctx);
Expand Down

0 comments on commit c2e3c80

Please sign in to comment.