summaryrefslogtreecommitdiff
path: root/scripts/blueshouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/blueshouse.asm')
-rwxr-xr-xscripts/blueshouse.asm14
1 files changed, 5 insertions, 9 deletions
diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm
index 060d5b16..b727bbd1 100755
--- a/scripts/blueshouse.asm
+++ b/scripts/blueshouse.asm
@@ -1,8 +1,9 @@
BluesHouseScript:
call EnableAutoTextBoxDrawing
ld hl, BluesHouseScriptPointers
- ld a, [wBluesHouseCurScript]
- jp CallFunctionInTable
+ xor a
+ call JumpTable
+ ret
BluesHouseScriptPointers:
dw BluesHouseScript0
@@ -14,8 +15,6 @@ BluesHouseScript0:
; trigger the next script
ld a, 1
ld [wBluesHouseCurScript], a
- ret
-
BluesHouseScript1:
ret
@@ -33,7 +32,6 @@ BluesHouseText1:
ld hl, DaisyInitialText
call PrintText
jr .done
-
.GiveMap
ld hl, DaisyOfferMapText
call PrintText
@@ -47,12 +45,10 @@ BluesHouseText1:
call PrintText
SetEvent EVENT_GOT_TOWN_MAP
jr .done
-
.GotMap
ld hl, DaisyUseMapText
call PrintText
jr .done
-
.BagFull
ld hl, DaisyBagFullText
call PrintText
@@ -80,10 +76,10 @@ DaisyUseMapText:
TX_FAR _DaisyUseMapText
db "@"
-BluesHouseText2: ; 0x19bc4 Daisy, walking around
+BluesHouseText2: ; Daisy, walking around
TX_FAR _BluesHouseText2
db "@"
-BluesHouseText3: ; 0x19bc9 map on table
+BluesHouseText3: ; map on table
TX_FAR _BluesHouseText3
db "@"