diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 710514cda1..a67d5a751c 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -2341,92 +2341,92 @@ @ Remove all of specified item from the player's bag and return the number of removed items to VAR_RESULT .macro removeallitem itemId:req - callnative ScrCmd_removeallitem + callnative ScrCmd_removeallitem .2byte \itemId .endm @ 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 - .2byte \localId - .2byte \posType - .2byte \destX - .2byte \destY + .2byte \localId + .2byte \posType + .2byte \destX + .2byte \destY .endm .macro getobjecttemplatexy localId:req, posType = TEMPLATE_POSITION, destX:req, destY:req callnative ScrCmd_getobjectxy - .2byte \localId - .2byte \posType - .2byte \destX - .2byte \destY + .2byte \localId + .2byte \posType + .2byte \destX + .2byte \destY .endm .macro getobjectcurrentxy localId:req, posType = CURRENT_POSITION, destX:req, destY:req callnative ScrCmd_getobjectxy - .2byte \localId - .2byte \posType - .2byte \destX - .2byte \destY + .2byte \localId + .2byte \posType + .2byte \destX + .2byte \destY .endm - @ 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 - callnative ScrCmd_checkobjectat - .2byte \x - .2byte \y - .2byte \dest + callnative ScrCmd_checkobjectat + .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 - .2byte \species - .2byte FLAG_GET_SEEN - .endm + @ Returns the state of the Pokedex Seen Flag to VAR_RESULT for the Pokemon with speciesId + .macro getseenmon species:req + callnative Scrcmd_getsetpokedexflag + .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 - .2byte \species - .2byte FLAG_GET_CAUGHT - .endm + @ Returns the state of the Pokedex Caught Flag to VAR_RESULT for the Pokemon with speciesId + .macro getcaughtmon species:req + callnative Scrcmd_getsetpokedexflag + .2byte \species + .2byte FLAG_GET_CAUGHT + .endm - @ Sets the Pokedex Seen Flag for the Pokemon with speciesId - .macro setseenmon species:req - callnative Scrcmd_getsetpokedexflag - .2byte \species - .2byte FLAG_SET_SEEN - .endm + @ Sets the Pokedex Seen Flag for the Pokemon with speciesId + .macro setseenmon species:req + callnative Scrcmd_getsetpokedexflag + .2byte \species + .2byte FLAG_SET_SEEN + .endm - @ Sets the Pokedex Caught Flag for the Pokemon with speciesId - .macro setcaughtmon species:req - callnative Scrcmd_getsetpokedexflag - .2byte \species - .2byte FLAG_SET_CAUGHT - .endm + @ Sets the Pokedex Caught Flag for the Pokemon with speciesId + .macro setcaughtmon species:req + callnative Scrcmd_getsetpokedexflag + .2byte \species + .2byte FLAG_SET_CAUGHT + .endm - @ Check if the Player has speciesId in their party. OPEN_PARTY_SCREEN will have the player select a mon from their party. NO_PARTY_SCREEN will automatically check every mon in the player's party. - .macro checkspecies speciesId:req, mode=NO_PARTY_SCREEN - .if \mode == OPEN_PARTY_SCREEN - special ChoosePartyMon - waitstate - callnative Scrcmd_checkspecies_choose - .2byte \speciesId - .else - callnative Scrcmd_checkspecies - .2byte \speciesId - .endif - .endm + @ Check if the Player has speciesId in their party. OPEN_PARTY_SCREEN will have the player select a mon from their party. NO_PARTY_SCREEN will automatically check every mon in the player's party. + .macro checkspecies speciesId:req, mode=NO_PARTY_SCREEN + .if \mode == OPEN_PARTY_SCREEN + special ChoosePartyMon + waitstate + callnative Scrcmd_checkspecies_choose + .2byte \speciesId + .else + callnative Scrcmd_checkspecies + .2byte \speciesId + .endif + .endm - .macro checkspecies_choose speciesId:req + .macro checkspecies_choose speciesId:req checkspecies \speciesId, OPEN_PARTY_SCREEN - .endm + .endm @ 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 - .2byte \localId - .2byte \dest - .endm + .macro getobjectfacingdirection localId:req, dest:req + callnative Scrcmd_getobjectfacingdirection + .2byte \localId + .2byte \dest + .endm