defeated female leaves

this makes the step counter and safari ball giving processes work but it still doesn't have the process of kicking the player out, nor does it display in the menu.

I also lost my mind trying to figure out how the screen flash bug works and gave up
This commit is contained in:
Llinos Evans 2024-07-30 00:50:28 +01:00
parent 4417b67d18
commit b8a6a6bfde
6 changed files with 24 additions and 20 deletions

View file

@ -577,10 +577,6 @@ DetermineMoveOrder:
ret
CheckSafariBattleOver:
IF DEF(_DEBUG) ; Use to test the Safari Game in the Debug Room.
ld a, 20
ld [wSafariBallsRemaining], a
ENDC
ld a, [wSafariBallsRemaining]
and a
ret nz
@ -5060,7 +5056,7 @@ BattleMenu_SafariBall:
ld a, [wInBattleTowerBattle]
and a
jp nz, .ItemsCantBeUsed
call LoadStandardMenuHeader
ld a, [wBattleType]
@ -5120,10 +5116,12 @@ BattleMenu_SafariBall:
ld a, [wWildMon]
and a
jr nz, .run
callfar CheckItemPocket
ld a, [wItemAttributeValue]
cp BALL
jr z, .ball
call ClearBGPalettes
call ClearTilemap