diff options
| author | Sylvie <35663410+Rangi42@users.noreply.github.com> | 2024-09-24 11:39:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-24 11:39:44 -0400 |
| commit | 635b9c4cab523100a797b17b28788281159371c0 (patch) | |
| tree | e2363703bfa658bd230f0822e8a1389837adb0dd /home | |
| parent | Identify hardware register bits (#469) (diff) | |
| download | pokeyellow-635b9c4cab523100a797b17b28788281159371c0.tar.gz pokeyellow-635b9c4cab523100a797b17b28788281159371c0.tar.xz pokeyellow-635b9c4cab523100a797b17b28788281159371c0.zip | |
Identify `wCurrentMapScriptFlags` bits (#467)
Diffstat (limited to 'home')
| -rw-r--r-- | home/overworld.asm | 8 | ||||
| -rw-r--r-- | home/trainers.asm | 4 |
2 files changed, 6 insertions, 6 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] diff --git a/home/trainers.asm b/home/trainers.asm index 0a466cc1..bcd15850 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -184,8 +184,8 @@ StartTrainerBattle:: EndTrainerBattle:: ld hl, wCurrentMapScriptFlags - set 5, [hl] - set 6, [hl] + set BIT_CUR_MAP_LOADED_1, [hl] + set BIT_CUR_MAP_LOADED_2, [hl] ld hl, wStatusFlags3 res BIT_PRINT_END_BATTLE_TEXT, [hl] ld hl, wMiscFlags |