You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
Default macro parameters use recursion; avoids repeating internal structure
This commit is contained in:
@@ -194,23 +194,23 @@ ENDM
|
|||||||
|
|
||||||
enum giveitem_command ; $1f
|
enum giveitem_command ; $1f
|
||||||
giveitem: MACRO
|
giveitem: MACRO
|
||||||
|
if _NARG == 1
|
||||||
|
giveitem \1, 1
|
||||||
|
else
|
||||||
db giveitem_command
|
db giveitem_command
|
||||||
db \1 ; item
|
db \1 ; item
|
||||||
if _NARG == 2
|
|
||||||
db \2 ; quantity
|
db \2 ; quantity
|
||||||
else
|
|
||||||
db 1
|
|
||||||
endc
|
endc
|
||||||
ENDM
|
ENDM
|
||||||
|
|
||||||
enum takeitem_command ; $20
|
enum takeitem_command ; $20
|
||||||
takeitem: MACRO
|
takeitem: MACRO
|
||||||
|
if _NARG == 1
|
||||||
|
takeitem \1, 1
|
||||||
|
else
|
||||||
db takeitem_command
|
db takeitem_command
|
||||||
db \1 ; item
|
db \1 ; item
|
||||||
if _NARG == 2
|
|
||||||
db \2 ; quantity
|
db \2 ; quantity
|
||||||
else
|
|
||||||
db 1
|
|
||||||
endc
|
endc
|
||||||
ENDM
|
ENDM
|
||||||
|
|
||||||
@@ -291,22 +291,20 @@ ENDM
|
|||||||
|
|
||||||
enum givepoke_command ; $2d
|
enum givepoke_command ; $2d
|
||||||
givepoke: MACRO
|
givepoke: MACRO
|
||||||
|
if _NARG == 2
|
||||||
|
givepoke \1, \2, NO_ITEM, FALSE
|
||||||
|
elif _NARG == 3
|
||||||
|
givepoke \1, \2, \3, FALSE
|
||||||
|
else
|
||||||
db givepoke_command
|
db givepoke_command
|
||||||
db \1 ; pokemon
|
db \1 ; pokemon
|
||||||
db \2 ; level
|
db \2 ; level
|
||||||
if _NARG >= 3
|
|
||||||
db \3 ; item
|
db \3 ; item
|
||||||
if _NARG >= 4
|
|
||||||
db \4 ; trainer
|
db \4 ; trainer
|
||||||
if \4
|
if \4
|
||||||
dw \5 ; trainer_name_pointer
|
dw \5 ; trainer_name_pointer
|
||||||
dw \6 ; pkmn_nickname
|
dw \6 ; pkmn_nickname
|
||||||
endc
|
endc
|
||||||
else
|
|
||||||
db 0
|
|
||||||
endc
|
|
||||||
else
|
|
||||||
db 0, 0
|
|
||||||
endc
|
endc
|
||||||
ENDM
|
ENDM
|
||||||
|
|
||||||
@@ -473,11 +471,11 @@ ENDM
|
|||||||
|
|
||||||
enum refreshscreen_command ; $48
|
enum refreshscreen_command ; $48
|
||||||
refreshscreen: MACRO
|
refreshscreen: MACRO
|
||||||
db refreshscreen_command
|
if _NARG == 0
|
||||||
if _NARG == 1
|
refreshscreen 0
|
||||||
db \1 ; dummy
|
|
||||||
else
|
else
|
||||||
db 0
|
db refreshscreen_command
|
||||||
|
db \1 ; dummy
|
||||||
endc
|
endc
|
||||||
ENDM
|
ENDM
|
||||||
|
|
||||||
@@ -982,12 +980,12 @@ ENDM
|
|||||||
|
|
||||||
enum verbosegiveitem_command ; $9e
|
enum verbosegiveitem_command ; $9e
|
||||||
verbosegiveitem: MACRO
|
verbosegiveitem: MACRO
|
||||||
|
if _NARG == 1
|
||||||
|
verbosegiveitem \1, 1
|
||||||
|
else
|
||||||
db verbosegiveitem_command
|
db verbosegiveitem_command
|
||||||
db \1 ; item
|
db \1 ; item
|
||||||
if _NARG == 2
|
|
||||||
db \2 ; quantity
|
db \2 ; quantity
|
||||||
else
|
|
||||||
db 1
|
|
||||||
endc
|
endc
|
||||||
ENDM
|
ENDM
|
||||||
|
|
||||||
|
@@ -92,10 +92,10 @@ ENDM
|
|||||||
itemball: MACRO
|
itemball: MACRO
|
||||||
;\1: item: from constants/item_constants.asm
|
;\1: item: from constants/item_constants.asm
|
||||||
;\2: quantity: default 1
|
;\2: quantity: default 1
|
||||||
if _NARG == 2
|
if _NARG == 1
|
||||||
db \1, \2
|
itemball \1, 1
|
||||||
else
|
else
|
||||||
db \1, 1
|
db \1, \2
|
||||||
endc
|
endc
|
||||||
ENDM
|
ENDM
|
||||||
|
|
||||||
|
@@ -28,7 +28,7 @@ OfficerScript_0x69d37:
|
|||||||
writetext UnknownText_0x69eb8
|
writetext UnknownText_0x69eb8
|
||||||
playsound SFX_KEY_ITEM
|
playsound SFX_KEY_ITEM
|
||||||
waitsfx
|
waitsfx
|
||||||
givepoke SPEAROW, 10, NO_ITEM, 1, GiftSpearowName, GiftSpearowOTName
|
givepoke SPEAROW, 10, NO_ITEM, TRUE, GiftSpearowName, GiftSpearowOTName
|
||||||
givepokeitem GiftSpearowMail
|
givepokeitem GiftSpearowMail
|
||||||
setevent EVENT_GOT_KENYA
|
setevent EVENT_GOT_KENYA
|
||||||
.alreadyhavekenya
|
.alreadyhavekenya
|
||||||
|
Reference in New Issue
Block a user