From 292cf55baddf6d0f32b9d59816497c2041e99953 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Fri, 17 Oct 2014 09:28:15 -0600 Subject: More idioms. --- scripts/beach_house.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'scripts') diff --git a/scripts/beach_house.asm b/scripts/beach_house.asm index 82d72c83..7f0f54cf 100644 --- a/scripts/beach_house.asm +++ b/scripts/beach_house.asm @@ -17,7 +17,7 @@ SurfinDudeText: jr nz,.next ld hl,.SurfinDudeText4 call PrintText - jr .xf2271 + jr .done .next ld hl,$d492 bit 0,[hl] @@ -29,8 +29,8 @@ SurfinDudeText: ld hl,.SurfinDudeText3 .next3 call PrintText - call $35ef - ld a,[$cc26] + call YesNoChoice + ld a,[wCurrentMenuItem] and a jr nz,.xf226b ld a,1 @@ -40,11 +40,11 @@ SurfinDudeText: call $3e84 ld hl,$d492 set 1,[hl] - jr .xf2271 + jr .done .xf226b ld hl,.SurfinDudeText2 call PrintText -.xf2271 +.done jp TextScriptEnd .SurfinDudeText1 @@ -151,8 +151,8 @@ BeachHouseSign4Text: ld [$cc3c],a ld hl,.BeachHousePrinterText3 call PrintText - call $35ef - ld a,[$cc26] + call YesNoChoice + ld a,[wCurrentMenuItem] and a jp z,$63d0 ; 0xf23d0 call $36ec -- cgit v1.2.3