diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 01522ab048..c60555f67d 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -2339,7 +2339,7 @@ @ 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 @@ -2347,7 +2347,7 @@ .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 @@ -2355,7 +2355,7 @@ .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 @@ -2364,7 +2364,7 @@ @ 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 @@ -2372,28 +2372,28 @@ @ 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 @@ -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 @@ -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 diff --git a/include/script.h b/include/script.h index 1546d15dd4..4fc2189035 100644 --- a/include/script.h +++ b/include/script.h @@ -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) \ ({ \