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

@ -189,3 +189,5 @@ SpecialsPointers::
; Restoring naming the mother. ; Restoring naming the mother.
add_special NameMom add_special NameMom
add_special ShoveSafariBallsDownKrissThroat
add_special GiveKrisSneakers

View file

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

View file

@ -439,6 +439,16 @@ TradebackNPC:
farcall TradebackGuy farcall TradebackGuy
ret ret
;FossilScientist: ShoveSafariBallsDownKrissThroat:
; farcall FossilScientistGuy ld a, 20
; ret ld [wSafariBallsRemaining], a
ret
GiveKrisSneakers:
; Give the player 500 steps...I think.
;ld a, 250
ld a, 10 ; just to test the PA.
ld [wSafariZoneStepCount], a
ld [wSafariZoneStepCount+1], a
xor a
ret

View file

@ -736,6 +736,7 @@ BallMultiplierFunctionTable:
dbw PARK_BALL, ParkBallMultiplier dbw PARK_BALL, ParkBallMultiplier
db -1 ; end db -1 ; end
SafariBallMultiplier:
UltraBallMultiplier: UltraBallMultiplier:
; multiply catch rate by 2 ; multiply catch rate by 2
sla b sla b
@ -743,7 +744,6 @@ UltraBallMultiplier:
ld b, $ff ld b, $ff
ret ret
SafariBallMultiplier:
GreatBallMultiplier: GreatBallMultiplier:
ParkBallMultiplier: ParkBallMultiplier:
; multiply catch rate by 1.5 ; multiply catch rate by 1.5

View file

@ -223,9 +223,6 @@ DisplayDexEntry:
call PlaceFarString call PlaceFarString
ret ret
POKeString: ; unreferenced
db "#@"
GetDexEntryPointer: GetDexEntryPointer:
; return dex entry pointer b:de ; return dex entry pointer b:de
push hl push hl

View file

@ -24,7 +24,11 @@ SafariZoneEntry:
waitbutton waitbutton
closetext closetext
opentext opentext
verbosegiveitem SAFARI_BALL, 30
; please shut up
special GiveKrisSneakers
special ShoveSafariBallsDownKrissThroat
opentext opentext
writetext SafariZoneEntranceText3 writetext SafariZoneEntranceText3
waitbutton waitbutton
@ -35,13 +39,6 @@ SafariZoneEntry:
warpfacing UP, SAFARI_ZONE_BETA, 9, 23 warpfacing UP, SAFARI_ZONE_BETA, 9, 23
setevent EVENT_IN_SAFARI_ZONE setevent EVENT_IN_SAFARI_ZONE
; Give the player 500 steps...I think.
;ld a, 250
;ld a, 10 ; just to test the PA.
;ld [wSafariZoneStepCount], a
;ld [wSafariZoneStepCount+1], a
;xor a
sjump .done sjump .done
.cantafford .cantafford
opentext opentext