diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 23:08:50 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 23:08:50 -0400 |
| commit | 9835d77c286b51adbe9cd1606f7a6f06d0ebaf2d (patch) | |
| tree | fffb118079c24d7686882d94a0a3d475d1fe2cf6 /scripts | |
| parent | d04de35b9229a1891ceb03e13605f3438f5a7de0 (diff) | |
Blue's House
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/blueshouse.asm | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm index 4a23df9e..959fb23e 100755 --- a/scripts/blueshouse.asm +++ b/scripts/blueshouse.asm @@ -1,8 +1,9 @@ BluesHouseScript: ; 19b3b (6:5b3b) call EnableAutoTextBoxDrawing - ld hl,BluesHouseScriptPointers - ld a,[W_BLUESHOUSECURSCRIPT] - jp JumpTable + ld hl, BluesHouseScriptPointers + xor a + call JumpTable + ret BluesHouseScriptPointers: ; 19b47 (6:5b47) dw BluesHouseScript0 @@ -12,10 +13,8 @@ BluesHouseScript0: ; 19b4b (6:5b4b) SetEvent EVENT_ENTERED_BLUES_HOUSE ; trigger the next script - ld a,1 - ld [W_BLUESHOUSECURSCRIPT],a - ret - + ld a, 1 + ld [W_BLUESHOUSECURSCRIPT], a BluesHouseScript1: ; 19b56 (6:5b56) ret @@ -27,31 +26,31 @@ BluesHouseTextPointers: ; 19b57 (6:5b57) BluesHouseText1: ; 19b5d (6:5b5d) TX_ASM CheckEvent EVENT_GOT_TOWN_MAP - jr nz,.GotMap + jr nz, .GotMap CheckEvent EVENT_GOT_POKEDEX - jr nz,.GiveMap - ld hl,DaisyInitialText + jr nz, .GiveMap + ld hl, DaisyInitialText call PrintText jr .done .GiveMap - ld hl,DaisyOfferMapText + ld hl, DaisyOfferMapText call PrintText lb bc, TOWN_MAP, 1 call GiveItem jr nc, .BagFull - ld a,HS_TOWN_MAP - ld [wMissableObjectIndex],a + ld a, HS_TOWN_MAP + ld [wMissableObjectIndex], a predef HideObject ; hide table map object - ld hl,GotMapText + ld hl, GotMapText call PrintText SetEvent EVENT_GOT_TOWN_MAP jr .done .GotMap - ld hl,DaisyUseMapText + ld hl, DaisyUseMapText call PrintText jr .done .BagFull - ld hl,DaisyBagFullText + ld hl, DaisyBagFullText call PrintText .done jp TextScriptEnd @@ -66,7 +65,7 @@ DaisyOfferMapText: ; 19baf (6:5baf) GotMapText: ; 19bb4 (6:5bb4) TX_FAR _GotMapText - db $11,"@" + db $11, "@" DaisyBagFullText: ; 19bba (6:5bba) TX_FAR _DaisyBagFullText |