aboutsummaryrefslogtreecommitdiffstats
path: root/home/overworld.asm
diff options
context:
space:
mode:
authorSylvie <35663410+Rangi42@users.noreply.github.com>2024-09-24 11:39:44 -0400
committerGitHub <noreply@github.com>2024-09-24 11:39:44 -0400
commit635b9c4cab523100a797b17b28788281159371c0 (patch)
treee2363703bfa658bd230f0822e8a1389837adb0dd /home/overworld.asm
parentIdentify hardware register bits (#469) (diff)
downloadpokeyellow-635b9c4cab523100a797b17b28788281159371c0.tar.gz
pokeyellow-635b9c4cab523100a797b17b28788281159371c0.tar.xz
pokeyellow-635b9c4cab523100a797b17b28788281159371c0.zip
Identify `wCurrentMapScriptFlags` bits (#467)
Diffstat (limited to 'home/overworld.asm')
-rw-r--r--home/overworld.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/home/overworld.asm b/home/overworld.asm
index 85969e46..80638815 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -33,8 +33,8 @@ EnterMap::
res BIT_NO_NPC_FACE_PLAYER, [hl]
call UpdateSprites
ld hl, wCurrentMapScriptFlags
- set 5, [hl]
- set 6, [hl]
+ set BIT_CUR_MAP_LOADED_1, [hl]
+ set BIT_CUR_MAP_LOADED_2, [hl]
xor a
ld [wJoyIgnore], a
@@ -329,8 +329,8 @@ OverworldLoopLessDelay::
ld hl, wStatusFlags7
res BIT_TRAINER_BATTLE, [hl]
ld hl, wCurrentMapScriptFlags
- set 5, [hl]
- set 6, [hl]
+ set BIT_CUR_MAP_LOADED_1, [hl]
+ set BIT_CUR_MAP_LOADED_2, [hl]
xor a
ldh [hJoyHeld], a
ld a, [wCurMap]