summaryrefslogtreecommitdiff
path: root/home/unknown_388f.asm
diff options
context:
space:
mode:
Diffstat (limited to 'home/unknown_388f.asm')
-rw-r--r--home/unknown_388f.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/home/unknown_388f.asm b/home/unknown_388f.asm
index 453c2f8..1182506 100644
--- a/home/unknown_388f.asm
+++ b/home/unknown_388f.asm
@@ -49,19 +49,19 @@ Function38d8::
ld [wd637], a
ret
-Function38e3::
+TestWildBattleStart::
ldh a, [hJoyState]
- and $f0
- ret z
- call Function3233
- jp nz, Function323e
+ and D_PAD
+ ret z ; if no directions are down, don't try and trigger a wild encounter
+ call CheckBPressedDebug
+ jp nz, ClearAccumulator ; if b button is down, clear acc
callab Function3ee3e
ld a, [wBattleMode]
and a
- ret z
+ ret z ; if no battle, return
ld a, $3
call WriteIntod637
- call Function3240
+ call SetFFInAccumulator
ret
Function3904::
@@ -92,7 +92,7 @@ Function3920::
ld hl, wJoypadFlags
res 4, [hl]
ld hl, .text
- call Function3111
+ call OpenTextbox
call RotateFourPalettesLeft
jp Init