diff options
author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
---|---|---|
committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
commit | c979b3bb03b121dd03a800df74144cd69a74601a (patch) | |
tree | 0d6bb48125efe6f6215347967383ba4c3b7da391 /scripts/beach_house.asm | |
parent | 269f2c3ba72776e975f5b00d9a1361cadbda42a7 (diff) | |
parent | 6e8c3883e430b567f7aa8f9230e366e03610bd5a (diff) |
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'scripts/beach_house.asm')
-rw-r--r-- | scripts/beach_house.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/beach_house.asm b/scripts/beach_house.asm index fb0d78f2..19554ba7 100644 --- a/scripts/beach_house.asm +++ b/scripts/beach_house.asm @@ -19,7 +19,7 @@ SurfinDudeText: call PrintText jr .done .next - ld hl, wPreventBlackout + ld hl, wd492 bit 0, [hl] set 0, [hl] jr nz, .next2 @@ -36,7 +36,7 @@ SurfinDudeText: ld a, 1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a callba SurfingPikachuMinigame - ld hl, wPreventBlackout + ld hl, wd492 set 1, [hl] jr .done .asm_f226b @@ -133,7 +133,7 @@ BeachHouseSign4Text: bit 6, a jr z, .asm_f2369 - ld hl, wPreventBlackout + ld hl, wd492 bit 1, [hl] jr z, .next2 ld a, 0 @@ -141,7 +141,7 @@ BeachHouseSign4Text: .next2 ld hl, .BeachHousePrinterText2 call PrintText - ld a, [wPreventBlackout] + ld a, [wd492] bit 1, a jr z, .asm_f236f @@ -152,13 +152,13 @@ BeachHouseSign4Text: call YesNoChoice ld a, [wCurrentMenuItem] and a - jp z, Func_f23d0 ; 0xf23d0 + jp z, Func_f23d0 call SaveScreenTilesToBuffer2 ld hl, wd730 set 6, [hl] xor a ld [wUpdateSpritesEnabled], a - callab Func_e910a + callab Printer_PrepareSurfingMinigameHighScoreTileMap call WaitForTextScrollButtonPress ld hl, wd730 res 6, [hl] |