diff options
Diffstat (limited to 'scripts/Route1_2.asm')
| -rwxr-xr-x | scripts/Route1_2.asm | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/scripts/Route1_2.asm b/scripts/Route1_2.asm index ee34ce55..94748252 100755 --- a/scripts/Route1_2.asm +++ b/scripts/Route1_2.asm @@ -1,53 +1,53 @@ -Func_f1ad2: +Func_f1ad2:: 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 - ld hl, Route1Text_f1aff - jr .asm_1cadd -.BagFull - ld hl, Route1Text_f1b0a - jr .asm_1cadd -.asm_1cada - ld hl, Route1Text_f1b05 -.asm_1cadd + jr nc, .bag_full + ld hl, Route1Text_1cae8 + jr .done +.bag_full + ld hl, Route1Text_1caf3 + jr .done +.got_item + ld hl, Route1Text_1caee +.done call PrintText ret Route1ViridianMartSampleText: - TX_FAR _Route1ViridianMartSampleText - db "@" + text_far _Route1ViridianMartSampleText + text_end -Route1Text_f1aff: - TX_FAR _Route1Text_1cae8 - TX_SFX_ITEM_1 - db "@" +Route1Text_1cae8: + text_far _Route1Text_1cae8 + sound_get_item_1 + text_end -Route1Text_f1b05: - TX_FAR _Route1Text_1caee - db "@" +Route1Text_1caee: + text_far _Route1Text_1caee + text_end -Route1Text_f1b0a: - TX_FAR _Route1Text_1caf3 - db "@" +Route1Text_1caf3: + text_far _Route1Text_1caf3 + text_end -Func_f1b0f: +Func_f1b0f:: ld hl, Route1Text_f1b16 call PrintText ret Route1Text_f1b16: - TX_FAR _Route1Text2 - db "@" + text_far _Route1Text2 + text_end -Func_f1b1b: +Func_f1b1b:: ld hl, Route1Text_f1b22 call PrintText ret Route1Text_f1b22: - TX_FAR _Route1Text3 - db "@" + text_far _Route1Text3 + text_end |