From 9401a659dad63b3219f8b5cf00a07fc68e534368 Mon Sep 17 00:00:00 2001 From: RavePossum Date: Sun, 16 Jun 2024 15:26:31 -0400 Subject: [PATCH] mass rename MessageInstant command --- asm/macros/scrcmd.inc | 4 ++-- res/field/scripts/script_0044.s | 2 +- res/field/scripts/script_0201.s | 2 +- res/field/scripts/script_0211.s | 4 ++-- res/field/scripts/script_0273.s | 10 +++++----- res/field/scripts/script_1118.s | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 97c7e05b80..3886cdb371 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -235,9 +235,9 @@ .short \arg1 .endm - .macro ScrCmd_02B arg0 + .macro MessageInstant messageID .short 43 - .byte \arg0 + .byte \messageID .endm .macro Message messageID diff --git a/res/field/scripts/script_0044.s b/res/field/scripts/script_0044.s index 0ba471950e..023e83dab4 100644 --- a/res/field/scripts/script_0044.s +++ b/res/field/scripts/script_0044.s @@ -130,7 +130,7 @@ _0184: ScrCmd_0CD 0 Message 18 ScrCmd_04B 0x5DC - ScrCmd_02B 19 + MessageInstant 19 ScrCmd_29F 1 Message 20 ScrCmd_0CE 0 diff --git a/res/field/scripts/script_0201.s b/res/field/scripts/script_0201.s index cacac0fef1..085cff580c 100644 --- a/res/field/scripts/script_0201.s +++ b/res/field/scripts/script_0201.s @@ -178,7 +178,7 @@ _0198: ScrCmd_064 26 ScrCmd_04A 0x5DC PlayFanfare 0x602 - ScrCmd_02B 13 + MessageInstant 13 ApplyMovement 26, _03B4 ApplyMovement 7, _0380 ApplyMovement 0xFF, _0408 diff --git a/res/field/scripts/script_0211.s b/res/field/scripts/script_0211.s index 25688323f8..7723b4d770 100644 --- a/res/field/scripts/script_0211.s +++ b/res/field/scripts/script_0211.s @@ -1040,7 +1040,7 @@ _0E0E: _0E21: ScrCmd_30B ScrCmd_0CD 0 - ScrCmd_02B 33 + MessageInstant 33 Call _0D2C Call _0C06 FadeScreen 6, 1, 1, 0 @@ -1101,7 +1101,7 @@ _0F01: _0F0A: ScrCmd_0CD 0 - ScrCmd_02B 33 + MessageInstant 33 Call _0E61 Call _0C06 FadeScreen 6, 1, 1, 0 diff --git a/res/field/scripts/script_0273.s b/res/field/scripts/script_0273.s index 0491907fb7..fdf55a440d 100644 --- a/res/field/scripts/script_0273.s +++ b/res/field/scripts/script_0273.s @@ -17,18 +17,18 @@ _001A: _0020: PlayFanfare 0x5DC LockAll - ScrCmd_02B 9 + MessageInstant 9 WaitTime 30, 0x800C - ScrCmd_02B 10 + MessageInstant 10 PlayFanfare 0x5DD WaitTime 30, 0x800C - ScrCmd_02B 11 + MessageInstant 11 PlayFanfare 0x5DD WaitTime 30, 0x800C - ScrCmd_02B 12 + MessageInstant 12 PlayFanfare 0x5DD WaitTime 30, 0x800C - ScrCmd_02B 13 + MessageInstant 13 PlayFanfare 0x643 WaitTime 30, 0x800C ScrCmd_253 0 diff --git a/res/field/scripts/script_1118.s b/res/field/scripts/script_1118.s index 54287de634..75b51f30c0 100644 --- a/res/field/scripts/script_1118.s +++ b/res/field/scripts/script_1118.s @@ -101,7 +101,7 @@ _019F: ScrCmd_0AD ScrCmd_0A1 Call _0BB2 - ScrCmd_02B 16 + MessageInstant 16 GoTo _00D0 End