From f87440a25a518b1eb54df0b46b7350aa5832416f Mon Sep 17 00:00:00 2001 From: pkmnsnfrn Date: Thu, 12 Sep 2024 05:43:55 -0700 Subject: [PATCH] Removed setmonball per https://github.com/rh-hideout/pokeemerald-expansion/pull/5177\#issuecomment-2294980531 --- .swo | Bin 0 -> 4096 bytes asm/macros/event.inc | 8 -------- data/specials.inc | 1 - src/field_specials.c | 6 ------ 4 files changed, 15 deletions(-) create mode 100644 .swo diff --git a/.swo b/.swo new file mode 100644 index 0000000000000000000000000000000000000000..dac352690102655cc3a6e5f5a7fee17b83ce8ed2 GIT binary patch literal 4096 zcmYc?2=nw+u+%eP00IFJ0RcOh7#IqQ(_mb@w2N!7cZh$0uBAm-n5(H7UbUl=qaiRF z0s|ESoT0`>hTyEOtfZ(QEEGCW4jHv~Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU;sh@ E055zBfdBvi literal 0 HcmV?d00001 diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 986ed8305f..a4057b22db 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -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. diff --git a/data/specials.inc b/data/specials.inc index ed88d42eae..54a5218c37 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -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 diff --git a/src/field_specials.c b/src/field_specials.c index 4081e83757..d26f9219cf 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -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;