diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 17:10:37 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 17:10:37 -0500 |
| commit | 401d6e7f36e86aa246a2c0591195e1f0f01e879f (patch) | |
| tree | 1a8c702fa533d2923c952e9f6b69bb28d657e357 /scripts/lavendermart.asm | |
| parent | Merge branch 'master' of https://github.com/pret/pokeyellow (diff) | |
| download | pokeyellow-401d6e7f36e86aa246a2c0591195e1f0f01e879f.tar.gz pokeyellow-401d6e7f36e86aa246a2c0591195e1f0f01e879f.tar.xz pokeyellow-401d6e7f36e86aa246a2c0591195e1f0f01e879f.zip | |
More syncing with pokered
from April 8, 2016 to present
Diffstat (limited to 'scripts/lavendermart.asm')
| -rwxr-xr-x | scripts/lavendermart.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/lavendermart.asm b/scripts/lavendermart.asm index 915c9662..51b64992 100755 --- a/scripts/lavendermart.asm +++ b/scripts/lavendermart.asm @@ -2,7 +2,7 @@ LavenderMartScript: jp EnableAutoTextBoxDrawing LavenderMartTextPointers: - dw LavenderMartText1 + dw LavenderCashierText dw LavenderMartText2 dw LavenderMartText3 @@ -13,20 +13,20 @@ LavenderMartText2: LavenderMartText3: TX_ASM CheckEvent EVENT_RESCUED_MR_FUJI - jr nz, .asm_c88d4 - ld hl, LavenderMart_5c953 + jr nz, .Nugget + ld hl, .ReviveText call PrintText - jr .asm_6d225 -.asm_c88d4 - ld hl, LavenderMart_5c958 + jr .done +.Nugget + ld hl, .NuggetText call PrintText -.asm_6d225 +.done jp TextScriptEnd -LavenderMart_5c953: - TX_FAR _LavenderMart_5c953 +.ReviveText + TX_FAR _LavenderMartReviveText db "@" -LavenderMart_5c958: - TX_FAR _LavenderMart_5c958 +.NuggetText + TX_FAR _LavenderMartNuggetText db "@" |