aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/SilphCo7F.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2025-01-30 21:40:19 -0600
committerdannye <33dannye@gmail.com>2025-01-30 21:40:19 -0600
commit6cb885a9f68b9f445d7fa45279731336fe0247d4 (patch)
tree39736ab1dd8ebcc57f8e981db6103285743d5530 /scripts/SilphCo7F.asm
parentIdentify unnamed functions in map_sprites.asm (#126) (diff)
parentFix some label typos, and add some constants instead of raw numbers (#492) (diff)
downloadpokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.gz
pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.xz
pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/SilphCo7F.asm')
-rw-r--r--scripts/SilphCo7F.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm
index e0bf102f..f1532448 100644
--- a/scripts/SilphCo7F.asm
+++ b/scripts/SilphCo7F.asm
@@ -296,7 +296,7 @@ SilphCo7FSilphWorkerM1Text:
lb bc, LAPRAS, 15
call GivePokemon
jr nc, .done
- ld a, [wSimulatedJoypadStatesEnd]
+ ld a, [wAddedToParty]
and a
call z, WaitForTextScrollButtonPress
call EnableAutoTextBoxDrawing