diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-16 17:00:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-16 17:00:57 -0400 |
| commit | d44c7c305c3f94b59e3e2c008408779836a0020a (patch) | |
| tree | 2cdc51be4a22992701038b959d6c964e9ee8fc58 /scripts/FuchsiaGoodRodHouse.asm | |
| parent | b9a113a9f4712771e37313a4c8a76f7ef23cebb2 (diff) | |
| parent | 7306c1dc2dca5666a5276a6758d1a64e1ddeae20 (diff) | |
Merge pull request #277 from Rangi42/master
Miscellaneous constant and label updates
Diffstat (limited to 'scripts/FuchsiaGoodRodHouse.asm')
| -rwxr-xr-x | scripts/FuchsiaGoodRodHouse.asm | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/scripts/FuchsiaGoodRodHouse.asm b/scripts/FuchsiaGoodRodHouse.asm index 848f744c..28f6d056 100755 --- a/scripts/FuchsiaGoodRodHouse.asm +++ b/scripts/FuchsiaGoodRodHouse.asm @@ -7,39 +7,30 @@ FuchsiaGoodRodHouse_TextPointers: FuchsiaHouse3Text1: text_asm ld a, [wd728] - bit 4, a - jr nz, .after - + bit 4, a ; got good rod? + jr nz, .got_item ld hl, FuchsiaHouse3Text_561bd call PrintText - call YesNoChoice ld a, [wCurrentMenuItem] and a jr nz, .refused - lb bc, GOOD_ROD, 1 call GiveItem - jr nc, .full - + jr nc, .bag_full ld hl, wd728 - set 4, [hl] - + set 4, [hl] ; got good rod ld hl, FuchsiaHouse3Text_561c2 - jr .talk - -.full + jr .done +.bag_full ld hl, FuchsiaHouse3Text_5621c - jr .talk - + jr .done .refused ld hl, FuchsiaHouse3Text_56212 - jr .talk - -.after + jr .done +.got_item ld hl, FuchsiaHouse3Text_56217 - -.talk +.done call PrintText jp TextScriptEnd |