aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/VermilionCity.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 /scripts/VermilionCity.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 'scripts/VermilionCity.asm')
-rw-r--r--scripts/VermilionCity.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm
index fd5905df..40a08dbc 100644
--- a/scripts/VermilionCity.asm
+++ b/scripts/VermilionCity.asm
@@ -1,13 +1,13 @@
VermilionCity_Script:
call EnableAutoTextBoxDrawing
ld hl, wCurrentMapScriptFlags
- bit 6, [hl]
- res 6, [hl]
+ bit BIT_CUR_MAP_LOADED_2, [hl]
+ res BIT_CUR_MAP_LOADED_2, [hl]
push hl
call nz, VermilionCityLeftSSAnneCallbackScript
pop hl
- bit 5, [hl]
- res 5, [hl]
+ bit BIT_CUR_MAP_LOADED_1, [hl]
+ res BIT_CUR_MAP_LOADED_1, [hl]
call nz, .setFirstLockTrashCanIndex
ld hl, VermilionCity_ScriptPointers
ld a, [wVermilionCityCurScript]