From 1665423e5214bc834c5f4cf8acc5c82bf3570347 Mon Sep 17 00:00:00 2001 From: pkmnsnfrn Date: Sat, 14 Sep 2024 07:11:04 -0700 Subject: [PATCH] Renamed scripts to match vanilla Cleaned up descriptions --- asm/macros/event.inc | 49 +++++++++++++++++++------------------------- src/scrcmd.c | 34 ++++++++++++++++++++++-------- 2 files changed, 46 insertions(+), 37 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 9a99ae3756..985ced862f 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -2341,76 +2341,74 @@ @ 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 RemoveAllItem + callnative ScrCmd_removeallitem .2byte \itemId .endm - @ Stores the position of the given object in VAR_0x8007 (x) and VAR_0x8008 (y). Mode CURRENT_POSITION will take the object's current position. Mode TEMPLATE_POSITION will takje the object's template position. + @ Stores the position of the given object in VAR_0x8007 (x) and VAR_0x8008 (y). 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 - callnative Script_GetObjectPosition + callnative ScrCmd_getobjectxy .2byte \localId .2byte \posType .endm .macro getobjecttemplatexy localId:req, posType = TEMPLATE_POSITION - callnative Script_GetObjectPosition + callnative ScrCmd_getobjectxy .2byte \localId .2byte \posType .endm .macro getobjectcurrentxy localId:req, posType = CURRENT_POSITION - callnative Script_GetObjectPosition + callnative ScrCmd_getobjectxy .2byte \localId .2byte \posType .endm - @ checks if there is any object at a given position + @ 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 Script_CheckObjectAtXY + callnative ScrCmd_checkobjectat .2byte \x .2byte \y .2byte \dest .endm - @ Checks the state of the Pokédex Seen flag of the specified Pokemon - @ The result is stored in VAR_RESULT + @ Returns the state of the Pokedex Seen Flag to VAR_RESULT for the Pokemon with speciesId .macro getseenmon species:req - callnative Script_Script_GetSetPokedexFlag + callnative Scrcmd_getsetpokedexflag .2byte \species .2byte FLAG_GET_SEEN .endm - @ Checks the state of the Pokédex Caught flag of the specified Pokemon - @ The result is stored in VAR_RESULT + @ Returns the state of the Pokedex Caught Flag to VAR_RESULT for the Pokemon with speciesId .macro getcaughtmon species:req - callnative Script_Script_GetSetPokedexFlag + callnative Scrcmd_getsetpokedexflag .2byte \species .2byte FLAG_GET_CAUGHT .endm - @ Sets the Pokédex Seen flag of the specified Pokemon + @ Sets the Pokedex Seen Flag for the Pokemon with speciesId .macro setseenmon species:req - callnative Script_Script_GetSetPokedexFlag + callnative Scrcmd_getsetpokedexflag .2byte \species .2byte FLAG_SET_SEEN .endm - @ Sets the Pokédex Caught flag of the specified Pokemon + @ Sets the Pokedex Caught Flag for the Pokemon with speciesId .macro setcaughtmon species:req - callnative Script_Script_GetSetPokedexFlag + 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. + @ 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 Script_CheckChosenMonMatchDesiredSpecie + callnative Scrcmd_checkspecies_choose .2byte \speciesId .else - callnative Script_CheckPartyHasSpecie + callnative Scrcmd_checkspecies .2byte \speciesId .endif .endm @@ -2419,15 +2417,10 @@ checkspecies \speciesId, OPEN_PARTY_SCREEN .endm - @ 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 - callnative Script_GetObjectFacingDirection + callnative Scrcmd_getobjectfacingdirection .2byte \localId - .byte \dest + .2byte \dest .endm - @ .macro checkobjectat x:req, y:req, dest = VAR_RESULT - @ callnative Script_CheckObjectAtXY - @ .2byte \x - @ .2byte \y - @ .2byte \dest diff --git a/src/scrcmd.c b/src/scrcmd.c index fc34720683..be5c3c9346 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -32,6 +32,7 @@ #include "mystery_event_script.h" #include "palette.h" #include "party_menu.h" +#include "pokedex.h" #include "pokemon_storage_system.h" #include "random.h" #include "overworld.h" @@ -53,7 +54,6 @@ #include "list_menu.h" #include "malloc.h" #include "constants/event_objects.h" -#include "pokedex.h" typedef u16 (*SpecialFunc)(void); typedef void (*NativeFunc)(struct ScriptContext *ctx); @@ -2475,30 +2475,38 @@ void ScriptSetDoubleBattleFlag(struct ScriptContext *ctx) sIsScriptedWildDouble = TRUE; } -void RemoveAllItem(struct ScriptContext *ctx) +bool8 ScrCmd_removeallitem(struct ScriptContext *ctx) { u32 itemId = VarGet(ScriptReadHalfword(ctx)); u32 count = CountTotalItemQuantityInBag(itemId); gSpecialVar_Result = count; RemoveBagItem(itemId, count); + + return FALSE; } -void Script_GetObjectPosition(struct ScriptContext *ctx) +bool8 ScrCmd_getobjectxy(struct ScriptContext *ctx) { u32 localId = VarGet(ScriptReadHalfword(ctx)); u32 useTemplate = VarGet(ScriptReadHalfword(ctx)); GetObjectPosition(localId,useTemplate); + + return FALSE; } -void Script_CheckObjectAtXY(struct ScriptContext *ctx) +bool8 ScrCmd_checkobjectat(struct ScriptContext *ctx) { u32 x = VarGet(ScriptReadHalfword(ctx)) + 7; u32 y = VarGet(ScriptReadHalfword(ctx)) + 7; - gSpecialVar_Result = CheckObjectAtXY(x,y); + u16 *varPointer = GetVarPointer(ScriptReadHalfword(ctx)); + + *varPointer = CheckObjectAtXY(x,y); + + return FALSE; } -void Script_GetSetPokedexFlag(struct ScriptContext *ctx) +bool8 Scrcmd_getsetpokedexflag(struct ScriptContext *ctx) { u32 speciesId = SpeciesToNationalPokedexNum(VarGet(ScriptReadHalfword(ctx))); bool32 desiredFlag = VarGet(ScriptReadHalfword(ctx)); @@ -2506,24 +2514,32 @@ void Script_GetSetPokedexFlag(struct ScriptContext *ctx) if (desiredFlag == FLAG_SET_CAUGHT) GetSetPokedexFlag(speciesId,FLAG_SET_SEEN); + + return FALSE; } -void Script_CheckPartyHasSpecie(struct ScriptContext *ctx) +bool8 Scrcmd_checkspecies(struct ScriptContext *ctx) { u32 givenSpecies = VarGet(ScriptReadHalfword(ctx)); gSpecialVar_Result = CheckPartyHasSpecie(givenSpecies); + + return FALSE; } -void Script_CheckChosenMonMatchDesiredSpecie(struct ScriptContext *ctx) +bool8 Scrcmd_checkspecies_choose(struct ScriptContext *ctx) { u32 givenSpecies = VarGet(ScriptReadHalfword(ctx)); gSpecialVar_Result = (GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_SPECIES) == givenSpecies); + + return FALSE; } -void Script_GetObjectFacingDirection(struct ScriptContext *ctx) +bool8 Scrcmd_getobjectfacingdirection(struct ScriptContext *ctx) { u32 objectId = VarGet(ScriptReadHalfword(ctx)); u16 *varPointer = GetVarPointer(ScriptReadHalfword(ctx)); *varPointer = gObjectEvents[GetObjectEventIdByLocalId(objectId)].facingDirection; + + return FALSE; }