atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed setmonball per https://github.com/rh-hideout/pokeemerald-expansion/pull/5177\#issuecomment-2294980531

Browse source
This commit is contained in:
pkmnsnfrn 2024-09-12 05:43:55 -07:00
parent a0e914b749
commit f87440a25a
4 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.swo Normal file
View file

Binary file not shown.

8
asm/macros/event.inc
View file

@ -2399,14 +2399,6 @@
setvar VAR_0x8005, \species
setvar VAR_0x8006, FLAG_SET_CAUGHT
specialvar VAR_RESULT, Script_GetSetPokedexFlag
.endm
@ Changes the caught ball of a selected Pokémon
.macro setmonball ballId:req
special ChoosePartyMon
waitstate
setvar VAR_0x8005, \ballId
special SetMonBall
.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.

1
data/specials.inc
View file

@ -557,7 +557,6 @@ gSpecials::
def_special GetObjectPosition
def_special CheckObjectAtXY
def_special Script_GetSetPokedexFlag
def_special SetMonBall
def_special CheckPartyHasSpecie
def_special CheckChosenMonMatchDesiredSpecie
def_special Script_GetObjectFacingDirection

6
src/field_specials.c
View file

@ -4334,12 +4334,6 @@ bool32 Script_GetSetPokedexFlag(void)
return GetSetPokedexFlag(speciesId,desiredFlag);
}
void SetMonBall(void)
{
u32 ballId = gSpecialVar_0x8005;
SetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_POKEBALL, &ballId);
}
bool32 CheckPartyHasSpecie(void)
{
u32 partyIndex;