Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed typo in requests_effects (#6215)

Browse Source 
Co-authored-by: Hedara <hedara90@gmail.com>
This commit is contained in:
hedara90 2025-02-09 22:59:31 +01:00 committed by GitHub
parent bd50fe6014
commit 174bc2f29f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
asm/macros/event.inc
View File

@ -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. @ 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 .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 \localId
.2byte \posType .2byte \posType
.2byte \destX .2byte \destX
@ -2347,7 +2347,7 @@
.endm .endm
.macro getobjecttemplatexy localId:req, posType = TEMPLATE_POSITION, destX:req, destY:req .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 \localId
.2byte \posType .2byte \posType
.2byte \destX .2byte \destX
@ -2355,7 +2355,7 @@
.endm .endm
.macro getobjectcurrentxy localId:req, posType = CURRENT_POSITION, destX:req, destY:req .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 \localId
.2byte \posType .2byte \posType
.2byte \destX .2byte \destX
@ -2364,7 +2364,7 @@
@ Return TRUE to dest if there is an object at the position x and y. @ Return TRUE to dest if there is an object at the position x and y.
.macro checkobjectat x:req, y:req, dest = VAR_RESULT .macro checkobjectat x:req, y:req, dest = VAR_RESULT
callnative ScrCmd_checkobjectat, request_effects=1 callnative ScrCmd_checkobjectat, requests_effects=1
.2byte \x .2byte \x
.2byte \y .2byte \y
.2byte \dest .2byte \dest
@ -2372,28 +2372,28 @@
@ Returns the state of the Pokedex Seen Flag to VAR_RESULT for the Pokemon with speciesId @ Returns the state of the Pokedex Seen Flag to VAR_RESULT for the Pokemon with speciesId
.macro getseenmon species:req .macro getseenmon species:req
callnative Scrcmd_getsetpokedexflag, request_effects=1 callnative Scrcmd_getsetpokedexflag, requests_effects=1
.2byte \species .2byte \species
.2byte FLAG_GET_SEEN .2byte FLAG_GET_SEEN
.endm .endm
@ Returns the state of the Pokedex Caught Flag to VAR_RESULT for the Pokemon with speciesId @ Returns the state of the Pokedex Caught Flag to VAR_RESULT for the Pokemon with speciesId
.macro getcaughtmon species:req .macro getcaughtmon species:req
callnative Scrcmd_getsetpokedexflag, request_effects=1 callnative Scrcmd_getsetpokedexflag, requests_effects=1
.2byte \species .2byte \species
.2byte FLAG_GET_CAUGHT .2byte FLAG_GET_CAUGHT
.endm .endm
@ Sets the Pokedex Seen Flag for the Pokemon with speciesId @ Sets the Pokedex Seen Flag for the Pokemon with speciesId
.macro setseenmon species:req .macro setseenmon species:req
callnative Scrcmd_getsetpokedexflag, request_effects=1 callnative Scrcmd_getsetpokedexflag, requests_effects=1
.2byte \species .2byte \species
.2byte FLAG_SET_SEEN .2byte FLAG_SET_SEEN
.endm .endm
@ Sets the Pokedex Caught Flag for the Pokemon with speciesId @ Sets the Pokedex Caught Flag for the Pokemon with speciesId
.macro setcaughtmon species:req .macro setcaughtmon species:req
callnative Scrcmd_getsetpokedexflag, request_effects=1 callnative Scrcmd_getsetpokedexflag, requests_effects=1
.2byte \species .2byte \species
.2byte FLAG_SET_CAUGHT .2byte FLAG_SET_CAUGHT
.endm .endm
@ -2403,10 +2403,10 @@
.if \mode == OPEN_PARTY_SCREEN .if \mode == OPEN_PARTY_SCREEN
special ChoosePartyMon special ChoosePartyMon
waitstate waitstate
callnative Scrcmd_checkspecies_choose, request_effects=1 callnative Scrcmd_checkspecies_choose, requests_effects=1
.2byte \speciesId .2byte \speciesId
.else .else
callnative Scrcmd_checkspecies, request_effects=1 callnative Scrcmd_checkspecies, requests_effects=1
.2byte \speciesId .2byte \speciesId
.endif .endif
.endm .endm
@ -2417,7 +2417,7 @@
@ Gets the facing direction of a given event object and stores it in the variable dest. @ Gets the facing direction of a given event object and stores it in the variable dest.
.macro getobjectfacingdirection localId:req, dest:req .macro getobjectfacingdirection localId:req, dest:req
callnative Scrcmd_getobjectfacingdirection, request_effects=1 callnative Scrcmd_getobjectfacingdirection, requests_effects=1
.2byte \localId .2byte \localId
.2byte \dest .2byte \dest
.endm .endm

2
include/script.h
View File

@ -133,7 +133,7 @@ static inline bool32 Script_IsAnalyzingEffects(void)
/* Optimize 'Script_RequestEffects' to a no-op if it would have no /* Optimize 'Script_RequestEffects' to a no-op if it would have no
* effect. 'Script_RequestEffects' must be called in all commands and * 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. */ * no effect to future-proof against new effects. */
#define Script_RequestEffects(effects) \ #define Script_RequestEffects(effects) \
({ \ ({ \