From ab2877bc532e101b99ce0e4f4dd3ed30d333aef8 Mon Sep 17 00:00:00 2001 From: RavePossum Date: Sun, 16 Jun 2024 09:35:15 -0400 Subject: [PATCH] Rename DebugWatch->Dummy1 --- asm/macros/scrcmd.inc | 2 +- res/field/scripts/script_0211.s | 2 +- res/field/scripts/script_0236.s | 2 +- res/field/scripts/script_0423.s | 4 ++-- res/field/scripts/script_1112.s | 4 ++-- res/field/scripts/script_1115.s | 16 ++++++++-------- src/unk_0203F6C4.c | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index ecb4a91fa2..48508cc3fa 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -2695,7 +2695,7 @@ .endm ; this is a dummy function that doesn't do anything - .macro DebugWatch dummy + .macro Dummy1 dummy .short 505 .short \dummy .endm diff --git a/res/field/scripts/script_0211.s b/res/field/scripts/script_0211.s index a323d24644..a850404b6d 100644 --- a/res/field/scripts/script_0211.s +++ b/res/field/scripts/script_0211.s @@ -76,7 +76,7 @@ _00EE: GoToIfGe 0x800C, 4, _027A SetVar 0x8004, 0 GetTimeOfDay 0x800C - DebugWatch 0x800C + Dummy1 0x800C SetVar 0x8004, 120 GoToIfEq 0x800C, 0, _0141 SetVar 0x8004, 121 diff --git a/res/field/scripts/script_0236.s b/res/field/scripts/script_0236.s index dca5057a32..e8752c2be4 100644 --- a/res/field/scripts/script_0236.s +++ b/res/field/scripts/script_0236.s @@ -47,7 +47,7 @@ _00C5: Return _00C7: - DebugWatch 0x4098 + Dummy1 0x4098 GoToIfEq 0x4098, 0, _0101 GoToIfEq 0x4098, 1, _0101 GoToIfEq 0x4098, 2, _0101 diff --git a/res/field/scripts/script_0423.s b/res/field/scripts/script_0423.s index 61ec4724f3..b33dcb3934 100644 --- a/res/field/scripts/script_0423.s +++ b/res/field/scripts/script_0423.s @@ -321,7 +321,7 @@ _0430: End _043C: - DebugWatch 0x40B8 + Dummy1 0x40B8 SetVar 0x40DD, 0 SetVar 0x40DE, 0 SetVar 0x40B8, 0 @@ -334,7 +334,7 @@ _043C: SetVar 0x40BC, 0 SetVar 0x40BA, 0 SetVar 0x40BF, 0 - DebugWatch 0x40B8 + Dummy1 0x40B8 End _048E: diff --git a/res/field/scripts/script_1112.s b/res/field/scripts/script_1112.s index 5cec65bfa5..642a61ed69 100644 --- a/res/field/scripts/script_1112.s +++ b/res/field/scripts/script_1112.s @@ -1017,10 +1017,10 @@ _0D6E: _0D88: AddVar 0x8007, 1 WaitTime 1, 0x800C - DebugWatch 0x8007 + Dummy1 0x8007 ScrCmd_2FC 0x800C GoToIfEq 0x800C, 1, _0DC2 - DebugWatch 0x8007 + Dummy1 0x8007 GoToIfEq 0x8007, 0x258, _0DC2 GoTo _0D88 End diff --git a/res/field/scripts/script_1115.s b/res/field/scripts/script_1115.s index dabbba679c..07a65b3104 100644 --- a/res/field/scripts/script_1115.s +++ b/res/field/scripts/script_1115.s @@ -10,7 +10,7 @@ _0006: LockAll ScrCmd_1E5 48 ScrCmd_235 0, 0x800C - DebugWatch 0x800C + Dummy1 0x800C SetVar 0x8008, 0x800C GoToIfEq 0x8008, 0, _005C GoToIfEq 0x8008, 1, _0074 @@ -48,8 +48,8 @@ _00AA: _00C5: ScrCmd_235 1, 3, 0x8004, 0x8005 - DebugWatch 0x8004 - DebugWatch 0x8005 + Dummy1 0x8004 + Dummy1 0x8005 ScrCmd_1FB 0x8004, 0x8005 ScrCmd_235 2 WaitABXPadPress @@ -58,13 +58,13 @@ _00C5: _00EB: ScrCmd_235 1, 1, 0x8004, 0x8005 - DebugWatch 0x8004 - DebugWatch 0x8005 + Dummy1 0x8004 + Dummy1 0x8005 ScrCmd_1FB 0x8004, 0x8005 ScrCmd_235 3, 0x8006, 0x8004, 0x8005 - DebugWatch 0x8006 - DebugWatch 0x8004 - DebugWatch 0x8005 + Dummy1 0x8006 + Dummy1 0x8004 + Dummy1 0x8005 ScrCmd_1FB 0x8004, 0x8005 WaitABXPadPress GoTo _0129 diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c index 8da1447833..3d930d4773 100644 --- a/src/unk_0203F6C4.c +++ b/src/unk_0203F6C4.c @@ -589,7 +589,7 @@ static BOOL ScrCmd_1E6(ScriptContext * ctx); static BOOL ScrCmd_1E7(ScriptContext * ctx); static BOOL ScrCmd_334(ScriptContext * ctx); static BOOL ScrCmd_335(ScriptContext * ctx); -static BOOL ScrCmd_DebugWatch(ScriptContext * ctx); +static BOOL ScrCmd_Dummy1(ScriptContext * ctx); static BOOL ScrCmd_200(ScriptContext * ctx); static BOOL ScrCmd_201(ScriptContext * ctx); static BOOL ScrCmd_202(ScriptContext * ctx); @@ -1278,7 +1278,7 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_1F6, ScrCmd_1F7, ScrCmd_1F8, - ScrCmd_DebugWatch, + ScrCmd_Dummy1, ScrCmd_1FA, ScrCmd_1FB, ScrCmd_1FC, @@ -1658,7 +1658,7 @@ static BOOL ScriptContext_DecrementTimer (ScriptContext * ctx) return *frames == 0; } -static BOOL ScrCmd_DebugWatch (ScriptContext *ctx) +static BOOL ScrCmd_Dummy1 (ScriptContext *ctx) { u16 dummy = ScriptContext_GetVar(ctx); return FALSE;