Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Text now shows if the Pokemon was added to the dex and what PC it went to.

voloved 2023-07-27 23:38:24 -04:00
parent 85bf0019f9
commit 5bad37e03f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Add-Thief-Ball.md

@ -775,8 +775,7 @@ index b22577455..b8605454e 100644
{ {
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
} }
- else if (!FlagGet(FLAG_SYS_POKEDEX_GET)) else if (!FlagGet(FLAG_SYS_POKEDEX_GET))
+ else if (!FlagGet(FLAG_SYS_POKEDEX_GET) || gUsingThiefBall == THIEF_BALL_CAUGHT)
{ {
HandleSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_SET_CAUGHT, personality); HandleSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_SET_CAUGHT, personality);
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
@ -841,9 +840,14 @@ index b7f0f693f..d1881fcf0 100644
finishturn finishturn
+BattleScript_SuccessBallThrowEndThief:: +BattleScript_SuccessBallThrowEndThief::
+ printstring STRINGID_GOTCHAPKMNCAUGHTNOBGM + printstring STRINGID_GOTCHAPKMNCAUGHTNOBGM
+ trysetcaughtmondexflags BattleScript_SuccessBallThrowEndThiefGive
+ printstring STRINGID_PKMNDATAADDEDTODEX
+ waitstate
+BattleScript_SuccessBallThrowEndThiefGive::
+ printfromtable gCaughtMonStringIds
+ waitmessage B_WAIT_TIME_LONG
+ givecaughtmon + givecaughtmon
+ cleareffectsonfaint BS_TARGET + cleareffectsonfaint BS_TARGET
+ trysetcaughtmondexflags BattleScript_HandleFaintedMon
+ goto BattleScript_HandleFaintedMon + goto BattleScript_HandleFaintedMon
BattleScript_WallyBallThrow:: BattleScript_WallyBallThrow::