diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events/card_key.asm | 2 | ||||
| -rw-r--r-- | engine/events/elevator.asm | 2 | ||||
| -rw-r--r-- | engine/events/hidden_objects/cinnabar_gym_quiz.asm | 2 | ||||
| -rw-r--r-- | engine/events/hidden_objects/vermilion_gym_trash.asm | 2 | ||||
| -rw-r--r-- | engine/menus/main_menu.asm | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/engine/events/card_key.asm b/engine/events/card_key.asm index 1597e12b..f3fa17fe 100644 --- a/engine/events/card_key.asm +++ b/engine/events/card_key.asm @@ -50,7 +50,7 @@ PrintCardKeyText: ld [wNewTileBlockID], a predef ReplaceTileBlock ld hl, wCurrentMapScriptFlags - set 5, [hl] + set BIT_CUR_MAP_LOADED_1, [hl] ld a, SFX_GO_INSIDE jp PlaySound .noCardKey diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index 8e871456..9d9b712a 100644 --- a/engine/events/elevator.asm +++ b/engine/events/elevator.asm @@ -20,7 +20,7 @@ DisplayElevatorFloorMenu: ld [wListScrollOffset], a ret c ld hl, wCurrentMapScriptFlags - set 7, [hl] + set BIT_CUR_MAP_USED_ELEVATOR, [hl] ld hl, wElevatorWarpMaps ld a, [wWhichPokemon] add a diff --git a/engine/events/hidden_objects/cinnabar_gym_quiz.asm b/engine/events/hidden_objects/cinnabar_gym_quiz.asm index 69f03f2c..a14bd198 100644 --- a/engine/events/hidden_objects/cinnabar_gym_quiz.asm +++ b/engine/events/hidden_objects/cinnabar_gym_quiz.asm @@ -83,7 +83,7 @@ CinnabarGymQuiz_AskQuestion: cp c jr nz, .wrongAnswer ld hl, wCurrentMapScriptFlags - set 5, [hl] + set BIT_CUR_MAP_LOADED_1, [hl] ldh a, [hGymGateIndex] ldh [hBackupGymGateIndex], a ld hl, CinnabarGymQuizCorrectText diff --git a/engine/events/hidden_objects/vermilion_gym_trash.asm b/engine/events/hidden_objects/vermilion_gym_trash.asm index c2bfed06..92fb1406 100644 --- a/engine/events/hidden_objects/vermilion_gym_trash.asm +++ b/engine/events/hidden_objects/vermilion_gym_trash.asm @@ -97,7 +97,7 @@ GymTrashScript: ; Completed the trash can puzzle. SetEvent EVENT_2ND_LOCK_OPENED ld hl, wCurrentMapScriptFlags - set 6, [hl] + set BIT_CUR_MAP_LOADED_2, [hl] tx_pre_id VermilionGymTrashSuccessText3 diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index df9f523f..8bd6f05e 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -91,7 +91,7 @@ MainMenu: .choseContinue call DisplayContinueGameInfo ld hl, wCurrentMapScriptFlags - set 5, [hl] + set BIT_CUR_MAP_LOADED_1, [hl] .inputLoop xor a ldh [hJoyPressed], a |