diff options
| -rw-r--r-- | asm/macros/scripts.inc | 33 | ||||
| -rw-r--r-- | data/scripts/script_080160A8.inc | 4 | ||||
| -rw-r--r-- | data/scripts/script_08016482.inc | 2 |
3 files changed, 21 insertions, 18 deletions
diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc index fefd4eb1..a4b52da0 100644 --- a/asm/macros/scripts.inc +++ b/asm/macros/scripts.inc @@ -502,25 +502,28 @@ .2byte \s .endm -.macro TextboxNoOverlapFollowTable a,b - .2byte 0x0c5d - .2byte \a - .2byte \b +.macro TextboxNoOverlapFollowTableOpN n label labels:vararg + .ifnb \labels + TextboxNoOverlapFollowTableOpN \n + 1 \labels + .else + .2byte 0x400 * (\n) + 0x5d + .endif .endm -.macro TextboxNoOverlapFollowTable_3 a,b,c - .2byte 0x105d - .2byte \a - .2byte \b - .2byte \c +.macro TextboxNoOverlapFollowTableOp labels:vararg + TextboxNoOverlapFollowTableOpN 2 \labels .endm -.macro TextboxNoOverlapFollowTable_4 a,b,c,d - .2byte 0x145d - .2byte \a - .2byte \b - .2byte \c - .2byte \d +.macro TextboxNoOverlapFollowTableLabel label labels:vararg + .2byte \label + .ifnb \labels + TextboxNoOverlapFollowTableLabel \labels + .endif +.endm + +.macro TextboxNoOverlapFollowTable labels:vararg + TextboxNoOverlapFollowTableOp \labels + TextboxNoOverlapFollowTableLabel \labels .endm .macro TextboxNoOverlapVar diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc index d6bc68aa..0bff4916 100644 --- a/data/scripts/script_080160A8.inc +++ b/data/scripts/script_080160A8.inc @@ -59,7 +59,7 @@ script_08016146: JumpIfNot script_08016146 _0807E864 GetInventoryValue 0x0025 - TextboxNoOverlapFollowTable_4 0x2d03, 0x2d02, 0x2d02, 0x2d02 + TextboxNoOverlapFollowTable 0x2d03, 0x2d02, 0x2d02, 0x2d02 _0807E3E8 JumpIfNot script_0801618A _0807E48C 0x0020 @@ -85,7 +85,7 @@ script_0801619A: JumpIfNot script_0801619A _0807E864 GetInventoryValue 0x0024 - TextboxNoOverlapFollowTable_4 0x2d05, 0x2d04, 0x2d04, 0x2d04 + TextboxNoOverlapFollowTable 0x2d05, 0x2d04, 0x2d04, 0x2d04 _0807E3E8 JumpIfNot script_080161E2 _0807E48C 0x0020 diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc index b994262f..01cb19f0 100644 --- a/data/scripts/script_08016482.inc +++ b/data/scripts/script_08016482.inc @@ -32,7 +32,7 @@ SCRIPT_START script_08016482 TextboxNoOverlapFollow 0x0601 TextboxNoOverlap 0x0601 TextboxNoOverlapFollowPos_1 0x0601 - TextboxNoOverlapFollowTable_3 0x0601, 0x0602, 0x0603 + TextboxNoOverlapFollowTable 0x0601, 0x0602, 0x0603 TextboxNoOverlapVar _0807EB28 0x0602 _0807EB38 |