diff --git a/data/events/special_pointers.asm b/data/events/special_pointers.asm index 1cf8848..6954b10 100644 --- a/data/events/special_pointers.asm +++ b/data/events/special_pointers.asm @@ -189,3 +189,5 @@ SpecialsPointers:: ; Restoring naming the mother. add_special NameMom + add_special ShoveSafariBallsDownKrissThroat + add_special GiveKrisSneakers diff --git a/engine/battle/core.asm b/engine/battle/core.asm index c03ccc5..f878ff5 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -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 diff --git a/engine/events/specials.asm b/engine/events/specials.asm index 9718b20..7e66fb1 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -439,6 +439,16 @@ TradebackNPC: farcall TradebackGuy ret -;FossilScientist: -; farcall FossilScientistGuy -; ret +ShoveSafariBallsDownKrissThroat: + ld a, 20 + 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 diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 0e42a53..cd4d2d2 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -736,6 +736,7 @@ BallMultiplierFunctionTable: dbw PARK_BALL, ParkBallMultiplier db -1 ; end +SafariBallMultiplier: UltraBallMultiplier: ; multiply catch rate by 2 sla b @@ -743,7 +744,6 @@ UltraBallMultiplier: ld b, $ff ret -SafariBallMultiplier: GreatBallMultiplier: ParkBallMultiplier: ; multiply catch rate by 1.5 diff --git a/engine/pokedex/pokedex_2.asm b/engine/pokedex/pokedex_2.asm index 59b2668..413095c 100644 --- a/engine/pokedex/pokedex_2.asm +++ b/engine/pokedex/pokedex_2.asm @@ -223,9 +223,6 @@ DisplayDexEntry: call PlaceFarString ret -POKeString: ; unreferenced - db "#@" - GetDexEntryPointer: ; return dex entry pointer b:de push hl diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index 8e1ba62..110aa8a 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -24,7 +24,11 @@ SafariZoneEntry: waitbutton closetext opentext - verbosegiveitem SAFARI_BALL, 30 + + ; please shut up + special GiveKrisSneakers + special ShoveSafariBallsDownKrissThroat + opentext writetext SafariZoneEntranceText3 waitbutton @@ -35,13 +39,6 @@ SafariZoneEntry: warpfacing UP, SAFARI_ZONE_BETA, 9, 23 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 .cantafford opentext