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/Route12SuperRodHouse.asm | |
| parent | b9a113a9f4712771e37313a4c8a76f7ef23cebb2 (diff) | |
| parent | 7306c1dc2dca5666a5276a6758d1a64e1ddeae20 (diff) | |
Merge pull request #277 from Rangi42/master
Miscellaneous constant and label updates
Diffstat (limited to 'scripts/Route12SuperRodHouse.asm')
| -rwxr-xr-x | scripts/Route12SuperRodHouse.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/scripts/Route12SuperRodHouse.asm b/scripts/Route12SuperRodHouse.asm index 6cc1602c..fba5426e 100755 --- a/scripts/Route12SuperRodHouse.asm +++ b/scripts/Route12SuperRodHouse.asm @@ -7,30 +7,30 @@ Route12SuperRodHouse_TextPointers: Route12HouseText1: text_asm ld a, [wd728] - bit 5, a - jr nz, .asm_b4cad + bit 5, a ; received super rod? + jr nz, .got_item ld hl, Route12HouseText_564c0 call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_a2d76 + jr nz, .refused lb bc, SUPER_ROD, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld hl, wd728 - set 5, [hl] + set 5, [hl] ; received super rod ld hl, Route12HouseText_564c5 - jr .asm_df984 -.BagFull + jr .done +.bag_full ld hl, Route12HouseText_564d9 - jr .asm_df984 -.asm_a2d76 + jr .done +.refused ld hl, Route12HouseText_564cf - jr .asm_df984 -.asm_b4cad + jr .done +.got_item ld hl, Route12HouseText_564d4 -.asm_df984 +.done call PrintText jp TextScriptEnd |