Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-09-08 01:35:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make variable checking for scrcmd macros more accurate (#920)

Browse Source
This commit is contained in:
Kalaay
2026-02-03 13:26:50 -08:00
committed by GitHub
parent f4eaf61198
commit e208083c73
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
asm/macros/scrcmd.inc
View File

@@ -163,10 +163,10 @@
.endm
.macro CompareVar varID, valueOrVarID
.if \valueOrVarID < VARS_START
CompareVarToValue \varID, \valueOrVarID
.else
.if ((\valueOrVarID >= VARS_START && \valueOrVarID <= VARS_END) || (\valueOrVarID >= SCRIPT_LOCAL_VARS_START && \valueOrVarID <= SCRIPT_LOCAL_VARS_END))
CompareVarToVar \varID, \valueOrVarID
.else
CompareVarToValue \varID, \valueOrVarID
.endif
.endm
@@ -294,10 +294,10 @@
.endm
.macro SetVar destVarID, valueOrVarID
.if \valueOrVarID < VARS_START
SetVarFromValue \destVarID, \valueOrVarID
.else
.if ((\valueOrVarID >= VARS_START && \valueOrVarID <= VARS_END) || (\valueOrVarID >= SCRIPT_LOCAL_VARS_START && \valueOrVarID <= SCRIPT_LOCAL_VARS_END))
SetVarFromVar \destVarID, \valueOrVarID
.else
SetVarFromValue \destVarID, \valueOrVarID
.endif
.endm
@@ -4060,10 +4060,10 @@
.endm
.macro SubtractCoins valueOrVarID
.if \valueOrVarID < VARS_START
SubtractCoinsFromValue \valueOrVarID
.else
.if ((\valueOrVarID >= VARS_START && \valueOrVarID <= VARS_END) || (\valueOrVarID >= SCRIPT_LOCAL_VARS_START && \valueOrVarID <= SCRIPT_LOCAL_VARS_END))
SubtractCoinsFromVar \valueOrVarID
.else
SubtractCoinsFromValue \valueOrVarID
.endif
.endm
@@ -4074,10 +4074,10 @@
.endm
.macro HasCoins varID, valueOrVarID
.if \valueOrVarID < VARS_START
HasCoinsFromValue \varID, \valueOrVarID
.else
.if ((\valueOrVarID >= VARS_START && \valueOrVarID <= VARS_END) || (\valueOrVarID >= SCRIPT_LOCAL_VARS_START && \valueOrVarID <= SCRIPT_LOCAL_VARS_END))
HasCoinsFromVar \varID, \valueOrVarID
.else
HasCoinsFromValue \varID, \valueOrVarID
.endif
.endm

1
generated/vars_flags.txt
View File

@@ -4403,3 +4403,4 @@ VAR_0x800A
VAR_0x800B
VAR_RESULT
VAR_LAST_TALKED
SCRIPT_LOCAL_VARS_END = VAR_LAST_TALKED