diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2016-01-29 11:20:47 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2016-01-29 11:20:47 -0500 |
| commit | 1980a5befc36eecc892daa7264de9d48c714b19e (patch) | |
| tree | 06884aae333d7a91b93a8c69e2013f0ba9954b6a /scripts | |
| parent | 32a464b0f0e71ced1e1e6641407012b6f6ee0d55 (diff) | |
Macrofy sprite status data in WRA0
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/blueshouse.asm | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm index eadcd388..806fbcab 100755 --- a/scripts/blueshouse.asm +++ b/scripts/blueshouse.asm @@ -1,7 +1,7 @@ BluesHouseScript: ; 19b3b (6:5b3b) call EnableAutoTextBoxDrawing - ld hl,BluesHouseScriptPointers - ld a,[wBluesHouseCurScript] + ld hl, BluesHouseScriptPointers + ld a, [wBluesHouseCurScript] jp CallFunctionInTable BluesHouseScriptPointers: ; 19b47 (6:5b47) @@ -12,8 +12,8 @@ BluesHouseScript0: ; 19b4b (6:5b4b) SetEvent EVENT_ENTERED_BLUES_HOUSE ; trigger the next script - ld a,1 - ld [wBluesHouseCurScript],a + ld a, 1 + ld [wBluesHouseCurScript], a ret BluesHouseScript1: ; 19b56 (6:5b56) @@ -27,31 +27,34 @@ 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 +69,8 @@ DaisyOfferMapText: ; 19baf (6:5baf) GotMapText: ; 19bb4 (6:5bb4) TX_FAR _GotMapText - db $11,"@" + sound0x0A + db "@" DaisyBagFullText: ; 19bba (6:5bba) TX_FAR _DaisyBagFullText |