Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed typo in requests_effects #6215

Merged
merged 2 commits into from
Feb 9, 2025
Merged

Fixed typo in requests_effects #6215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2f4373
Fixed typo in requests_effects
Feb 8, 2025
2af09fd
Fixed comment
Feb 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions asm/macros/event.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2339,23 +2339,23 @@

@ Stores the position of the given object in destX and destY. Mode CURRENT_POSITION will take the object's current position. Mode TEMPLATE_POSITION will take the object's template position.
.macro getobjectxy localId:req, posType:req, destX:req, destY:req
callnative ScrCmd_getobjectxy, request_effects=1
callnative ScrCmd_getobjectxy, requests_effects=1
.2byte \localId
.2byte \posType
.2byte \destX
.2byte \destY
.endm

.macro getobjecttemplatexy localId:req, posType = TEMPLATE_POSITION, destX:req, destY:req
callnative ScrCmd_getobjectxy, request_effects=1
callnative ScrCmd_getobjectxy, requests_effects=1
.2byte \localId
.2byte \posType
.2byte \destX
.2byte \destY
.endm

.macro getobjectcurrentxy localId:req, posType = CURRENT_POSITION, destX:req, destY:req
callnative ScrCmd_getobjectxy, request_effects=1
callnative ScrCmd_getobjectxy, requests_effects=1
.2byte \localId
.2byte \posType
.2byte \destX
Expand All @@ -2364,36 +2364,36 @@

@ Return TRUE to dest if there is an object at the position x and y.
.macro checkobjectat x:req, y:req, dest = VAR_RESULT
callnative ScrCmd_checkobjectat, request_effects=1
callnative ScrCmd_checkobjectat, requests_effects=1
.2byte \x
.2byte \y
.2byte \dest
.endm

@ Returns the state of the Pokedex Seen Flag to VAR_RESULT for the Pokemon with speciesId
.macro getseenmon species:req
callnative Scrcmd_getsetpokedexflag, request_effects=1
callnative Scrcmd_getsetpokedexflag, requests_effects=1
.2byte \species
.2byte FLAG_GET_SEEN
.endm

@ Returns the state of the Pokedex Caught Flag to VAR_RESULT for the Pokemon with speciesId
.macro getcaughtmon species:req
callnative Scrcmd_getsetpokedexflag, request_effects=1
callnative Scrcmd_getsetpokedexflag, requests_effects=1
.2byte \species
.2byte FLAG_GET_CAUGHT
.endm

@ Sets the Pokedex Seen Flag for the Pokemon with speciesId
.macro setseenmon species:req
callnative Scrcmd_getsetpokedexflag, request_effects=1
callnative Scrcmd_getsetpokedexflag, requests_effects=1
.2byte \species
.2byte FLAG_SET_SEEN
.endm

@ Sets the Pokedex Caught Flag for the Pokemon with speciesId
.macro setcaughtmon species:req
callnative Scrcmd_getsetpokedexflag, request_effects=1
callnative Scrcmd_getsetpokedexflag, requests_effects=1
.2byte \species
.2byte FLAG_SET_CAUGHT
.endm
Expand All @@ -2403,10 +2403,10 @@
.if \mode == OPEN_PARTY_SCREEN
special ChoosePartyMon
waitstate
callnative Scrcmd_checkspecies_choose, request_effects=1
callnative Scrcmd_checkspecies_choose, requests_effects=1
.2byte \speciesId
.else
callnative Scrcmd_checkspecies, request_effects=1
callnative Scrcmd_checkspecies, requests_effects=1
.2byte \speciesId
.endif
.endm
Expand All @@ -2417,7 +2417,7 @@

@ Gets the facing direction of a given event object and stores it in the variable dest.
.macro getobjectfacingdirection localId:req, dest:req
callnative Scrcmd_getobjectfacingdirection, request_effects=1
callnative Scrcmd_getobjectfacingdirection, requests_effects=1
.2byte \localId
.2byte \dest
.endm
Expand Down
2 changes: 1 addition & 1 deletion include/script.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ static inline bool32 Script_IsAnalyzingEffects(void)

/* Optimize 'Script_RequestEffects' to a no-op if it would have no
* effect. 'Script_RequestEffects' must be called in all commands and
* natives/specials with 'request_effects=TRUE' even if it would have
* natives/specials with 'requests_effects=TRUE' even if it would have
* no effect to future-proof against new effects. */
#define Script_RequestEffects(effects) \
({ \
Expand Down