another variadic macro

This commit is contained in:
Henny022p 2021-03-08 01:04:24 +01:00
parent 9bef8b068c
commit daec92fefc
3 changed files with 21 additions and 18 deletions

View File

@ -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

View File

@ -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

View File

@ -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