ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 07:03:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update generic macro argument names

Browse Source
This commit is contained in:
GriffinR 2022-03-10 16:36:41 -05:00
parent b1d61b9227
commit bb91b1b0d1
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
asm/macros/event.inc
View File

@ -828,10 +828,10 @@
.endm .endm
@ Sets the movement type (MOVEMENT_TYPE_*) for an object's template. @ Sets the movement type (MOVEMENT_TYPE_*) for an object's template.
.macro setobjectmovementtype word:req, byte:req .macro setobjectmovementtype localId:req, movementType:req
.byte 0x65 .byte 0x65
.2byte \word .2byte \localId
.byte \byte .byte \movementType
.endm .endm
@ If a standard message box (or its text) is being drawn on-screen, this command blocks script execution until the @ If a standard message box (or its text) is being drawn on-screen, this command blocks script execution until the
@ -1451,48 +1451,48 @@
.endm .endm
@ Equivalent to goto using the relative address set by setvaddress. @ Equivalent to goto using the relative address set by setvaddress.
.macro vgoto pointer:req .macro vgoto destination:req
.byte 0xb9 .byte 0xb9
.4byte \pointer .4byte \destination
.endm .endm
@ Equivalent to call using the relative address set by setvaddress. @ Equivalent to call using the relative address set by setvaddress.
.macro vcall pointer:req .macro vcall destination:req
.byte 0xba .byte 0xba
.4byte \pointer .4byte \destination
.endm .endm
@ Equivalent to goto_if using the relative address set by setvaddress. @ Equivalent to goto_if using the relative address set by setvaddress.
.macro vgoto_if byte:req, pointer:req .macro vgoto_if condition:req, destination:req
.byte 0xbb .byte 0xbb
.byte \byte .byte \condition
.4byte \pointer .4byte \destination
.endm .endm
@ Equivalent to call_if using the relative address set by setvaddress. @ Equivalent to call_if using the relative address set by setvaddress.
.macro vcall_if byte:req, pointer:req .macro vcall_if condition:req, destination:req
.byte 0xbc .byte 0xbc
.byte \byte .byte \condition
.4byte \pointer .4byte \destination
.endm .endm
@ Equivalent to message using the relative address set by setvaddress. @ Equivalent to message using the relative address set by setvaddress.
.macro vmessage pointer:req .macro vmessage text:req
.byte 0xbd .byte 0xbd
.4byte \pointer .4byte \text
.endm .endm
@ Expands the given text at the pointer (- the relative address set by setvaddress) into gStringVar4 @ Expands the given text at the pointer (- the relative address set by setvaddress) into gStringVar4
.macro vbuffermessage ptr:req .macro vbuffermessage text:req
.byte 0xbe .byte 0xbe
.4byte \ptr .4byte \text
.endm .endm
@ Equivalent to bufferstring using the relative address set by setvaddress. @ Equivalent to bufferstring using the relative address set by setvaddress.
.macro vbufferstring stringVarIndex:req, pointer:req .macro vbufferstring stringVarIndex:req, text:req
.byte 0xbf .byte 0xbf
stringvar \stringVarIndex stringvar \stringVarIndex
.4byte \pointer .4byte \text
.endm .endm
@ Create a window showing how many Coins the player has. @ Create a window showing how many Coins the player has.
@ -1549,9 +1549,9 @@
.endm .endm
@ Used only in FireRed/LeafGreen, does nothing in Emerald. @ Used only in FireRed/LeafGreen, does nothing in Emerald.
.macro loadhelp pointer:req .macro loadhelp text:req
.byte 0xc8 .byte 0xc8
.4byte \pointer .4byte \text
.endm .endm
@ Used only in FireRed/LeafGreen, does nothing in Emerald. @ Used only in FireRed/LeafGreen, does nothing in Emerald.