aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/GameCorner.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/GameCorner.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/GameCorner.asm')
-rw-r--r--scripts/GameCorner.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/GameCorner.asm b/scripts/GameCorner.asm
index 5d5236c5..cac3170c 100644
--- a/scripts/GameCorner.asm
+++ b/scripts/GameCorner.asm
@@ -8,8 +8,8 @@ GameCorner_Script:
GameCornerSelectLuckySlotMachine:
ld hl, wCurrentMapScriptFlags
- bit 6, [hl]
- res 6, [hl]
+ bit BIT_CUR_MAP_LOADED_2, [hl]
+ res BIT_CUR_MAP_LOADED_2, [hl]
ret z
call Random
ldh a, [hRandomAdd]
@@ -25,8 +25,8 @@ GameCornerSelectLuckySlotMachine:
GameCornerSetRocketHideoutDoorTile:
ld hl, wCurrentMapScriptFlags
- bit 5, [hl]
- res 5, [hl]
+ bit BIT_CUR_MAP_LOADED_1, [hl]
+ res BIT_CUR_MAP_LOADED_1, [hl]
ret z
CheckEvent EVENT_FOUND_ROCKET_HIDEOUT
ret nz
@@ -111,8 +111,8 @@ GameCornerRocketExitScript:
ld [wMissableObjectIndex], a
predef HideObject
ld hl, wCurrentMapScriptFlags
- set 5, [hl]
- set 6, [hl]
+ set BIT_CUR_MAP_LOADED_1, [hl]
+ set BIT_CUR_MAP_LOADED_2, [hl]
ld a, SCRIPT_GAMECORNER_DEFAULT
ld [wGameCornerCurScript], a
ret