summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author2Tie <foxman95@ymail.com>2018-06-18 22:36:17 -0600
committer2Tie <foxman95@ymail.com>2018-06-18 22:36:17 -0600
commitb44077ed3180b57a852db48f784312f6a1b0221a (patch)
treeb0f156ebd692258529869571dafd244a47690433
parent753cec9bd6b6904879fde5c02fb75e3c92801c2f (diff)
this was a silly mistake
-rw-r--r--home/talk_to_npc.asm6
-rw-r--r--home/unknown_388f.asm2
2 files changed, 4 insertions, 4 deletions
diff --git a/home/talk_to_npc.asm b/home/talk_to_npc.asm
index 69d59db..4b2261b 100644
--- a/home/talk_to_npc.asm
+++ b/home/talk_to_npc.asm
@@ -340,13 +340,13 @@ GetInlineMapObject:: ; 00:31EB
and a
ret
-CheckAPressedDebug ; 3233
- ; If in debug mode, returns a check on the A button.
+CheckBPressedDebug ; 3233
+ ; If in debug mode, returns a check on the B button.
ld a, [wDebugFlags]
bit DEBUG_FIELD_F, a
ret z
ldh a, [hJoyState]
- bit A_BUTTON, a
+ bit B_BUTTON_F, a
ret
ClearAccumulator:: ; 323E
diff --git a/home/unknown_388f.asm b/home/unknown_388f.asm
index 5fdad1c..447f6cf 100644
--- a/home/unknown_388f.asm
+++ b/home/unknown_388f.asm
@@ -53,7 +53,7 @@ TestWildBattleStart::
ldh a, [hJoyState]
and D_PAD
ret z ; if no directions are down, don't try and trigger a wild encounter
- call CheckAPressedDebug
+ call CheckBPressedDebug
jp nz, ClearAccumulator ; if b button is down, clear acc
callab Function3ee3e
ld a, [wBattleMode]