summaryrefslogtreecommitdiff
path: root/home/joypad.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-01-04 20:08:43 -0500
committerGitHub <noreply@github.com>2020-01-04 20:08:43 -0500
commit94ebdab6d350fd6ebfd43c5a84710ed14dade8ca (patch)
treea3b0d23a7501a337fb150ffb9253b3d5a301c657 /home/joypad.asm
parent9aeb0ab522ad36796b2ace55cca17e7314a3bc9a (diff)
parent739a60b33c54021c975f22d627e4b5e40206fe37 (diff)
Merge pull request #660 from mid-kid/master
Make the map setup commands match the actual function names better
Diffstat (limited to 'home/joypad.asm')
-rw-r--r--home/joypad.asm9
1 files changed, 9 insertions, 0 deletions
diff --git a/home/joypad.asm b/home/joypad.asm
index 819c7f532..f562d0878 100644
--- a/home/joypad.asm
+++ b/home/joypad.asm
@@ -338,6 +338,12 @@ JoyTextDelay::
ret
WaitPressAorB_BlinkCursor::
+; Show a blinking cursor in the lower right-hand
+; corner of a textbox and wait until A or B is
+; pressed.
+;
+; NOTE: The cursor has to be shown before calling
+; this function or no cursor will be shown at all.
ldh a, [hMapObjectIndexBuffer]
push af
ldh a, [hObjectStructIndexBuffer]
@@ -373,6 +379,9 @@ SimpleWaitPressAorB::
ret
PromptButton::
+; Show a blinking cursor in the lower right-hand
+; corner of a textbox and wait until A or B is
+; pressed, afterwards, play a sound.
ld a, [wLinkMode]
and a
jr nz, .link