diff options
Diffstat (limited to 'scripts/LoreleisRoom.asm')
| -rw-r--r-- | scripts/LoreleisRoom.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/LoreleisRoom.asm b/scripts/LoreleisRoom.asm index c1cc2adb..455561b8 100644 --- a/scripts/LoreleisRoom.asm +++ b/scripts/LoreleisRoom.asm @@ -11,11 +11,11 @@ LoreleisRoom_Script: LoreleiShowOrHideExitBlock: ; Blocks or clears the exit to the next room. 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 - ld hl, wBeatLorelei - set 1, [hl] + ld hl, wElite4Flags + set BIT_STARTED_ELITE_4, [hl] CheckEvent EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 jr z, .blockExitToNextRoom ld a, $5 @@ -77,7 +77,7 @@ LoreleisRoomDefaultScript: jr z, LoreleiScriptWalkIntoRoom .stopPlayerFromLeaving ld a, TEXT_LORELEISROOM_DONT_RUN_AWAY - ldh [hSpriteIndexOrTextID], a + ldh [hTextID], a call DisplayTextID ; "Don't run away!" ld a, D_UP ld [wSimulatedJoypadStatesEnd], a @@ -113,7 +113,7 @@ LoreleisRoomLoreleiEndBattleScript: cp $ff jp z, ResetLoreleiScript ld a, TEXT_LORELEISROOM_LORELEI - ldh [hSpriteIndexOrTextID], a + ldh [hTextID], a jp DisplayTextID LoreleisRoom_TextPointers: |