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/Route1.asm | |
| parent | b9a113a9f4712771e37313a4c8a76f7ef23cebb2 (diff) | |
| parent | 7306c1dc2dca5666a5276a6758d1a64e1ddeae20 (diff) | |
Merge pull request #277 from Rangi42/master
Miscellaneous constant and label updates
Diffstat (limited to 'scripts/Route1.asm')
| -rwxr-xr-x | scripts/Route1.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/Route1.asm b/scripts/Route1.asm index 3aa948c7..bd9afea3 100755 --- a/scripts/Route1.asm +++ b/scripts/Route1.asm @@ -9,20 +9,20 @@ Route1_TextPointers: Route1Text1: text_asm CheckAndSetEvent EVENT_GOT_POTION_SAMPLE - jr nz, .asm_1cada + jr nz, .got_item ld hl, Route1ViridianMartSampleText call PrintText lb bc, POTION, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld hl, Route1Text_1cae8 - jr .asm_1cadd -.BagFull + jr .done +.bag_full ld hl, Route1Text_1caf3 - jr .asm_1cadd -.asm_1cada + jr .done +.got_item ld hl, Route1Text_1caee -.asm_1cadd +.done call PrintText jp TextScriptEnd |