thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-11-12 00:14:45 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

Browse source
This commit is contained in:
Llinos Evans 2024-07-31 00:29:52 +01:00
parent 4035bf36f0
commit 7638708d51
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
engine/battle/core.asm
View file

@ -53,10 +53,10 @@ DoBattle:
jp z, LostBattle jp z, LostBattle
call SafeLoadTempTilemapToTilemap call SafeLoadTempTilemapToTilemap
ld a, [wBattleType] ld a, [wBattleType]
cp BATTLETYPE_SAFARI
jp z, SafariBattle
cp BATTLETYPE_TUTORIAL cp BATTLETYPE_TUTORIAL
jp z, .tutorial_debug jp z, .tutorial_debug
cp BATTLETYPE_SAFARI
jp z, SafariBattle
xor a xor a
ld [wCurPartyMon], a ld [wCurPartyMon], a
.loop2 .loop2
@ -4937,6 +4937,7 @@ BattleMenu_Bait:
call StdBattleTextbox call StdBattleTextbox
ld hl, wEnemyMonCatchRate ld hl, wEnemyMonCatchRate
srl [hl] ; halve catch rate srl [hl] ; halve catch rate
; need an animation
ld hl, wSafariMonEating ld hl, wSafariMonEating
ld de, wSafariMonAngerCount ld de, wSafariMonAngerCount
jr BattleMenu_BaitRock_Common jr BattleMenu_BaitRock_Common
@ -4946,6 +4947,7 @@ BattleMenu_Rock:
call StdBattleTextbox call StdBattleTextbox
ld hl, wEnemyMonCatchRate ld hl, wEnemyMonCatchRate
ld a, [hl] ld a, [hl]
; wants an animation here
add a ; double catch rate add a ; double catch rate
jr nc, .noCarry jr nc, .noCarry
ld a, $ff ld a, $ff
@ -5052,6 +5054,7 @@ BattleMenu_Pack:
ld a, [wLinkMode] ld a, [wLinkMode]
and a and a
jp nz, BattleMenu_SafariBall.ItemsCantBeUsed jp nz, BattleMenu_SafariBall.ItemsCantBeUsed
; fallthrough
BattleMenu_SafariBall: BattleMenu_SafariBall:
ld a, [wInBattleTowerBattle] ld a, [wInBattleTowerBattle]
and a and a
@ -5134,7 +5137,7 @@ BattleMenu_SafariBall:
cp BATTLETYPE_TUTORIAL cp BATTLETYPE_TUTORIAL
jr z, .tutorial2 jr z, .tutorial2
cp BATTLETYPE_SAFARI cp BATTLETYPE_SAFARI
call nz, GetMonBackpic call nz, GetBattleMonBackpic
.tutorial2 .tutorial2
call GetEnemyMonFrontpic call GetEnemyMonFrontpic