diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
| commit | c979b3bb03b121dd03a800df74144cd69a74601a (patch) | |
| tree | 0d6bb48125efe6f6215347967383ba4c3b7da391 /scripts/celadonmart3.asm | |
| parent | 269f2c3ba72776e975f5b00d9a1361cadbda42a7 (diff) | |
| parent | 6e8c3883e430b567f7aa8f9230e366e03610bd5a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'scripts/celadonmart3.asm')
| -rwxr-xr-x | scripts/celadonmart3.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/scripts/celadonmart3.asm b/scripts/celadonmart3.asm index 49e5e84b..25bf4e80 100755 --- a/scripts/celadonmart3.asm +++ b/scripts/celadonmart3.asm @@ -1,7 +1,7 @@ -CeladonMart3Script: ; 48225 (12:4225) +CeladonMart3Script: jp EnableAutoTextBoxDrawing -CeladonMart3TextPointers: ; 48228 (12:4228) +CeladonMart3TextPointers: dw CeladonMart3Text1 dw CeladonMart3Text2 dw CeladonMart3Text3 @@ -20,56 +20,56 @@ CeladonMart3TextPointers: ; 48228 (12:4228) dw CeladonMart3Text16 dw CeladonMart3Text17 -CeladonMart3Text1: ; 4824a (12:424a) +CeladonMart3Text1: TX_ASM callab Func_f1e30 jp TextScriptEnd -CeladonMart3Text2: ; 4828d (12:428d) +CeladonMart3Text2: TX_FAR _CeladonMart3Text2 db "@" -CeladonMart3Text3: ; 48292 (12:4292) +CeladonMart3Text3: TX_FAR _CeladonMart3Text3 db "@" -CeladonMart3Text4: ; 48297 (12:4297) +CeladonMart3Text4: TX_FAR _CeladonMart3Text4 db "@" -CeladonMart3Text5: ; 4829c (12:429c) +CeladonMart3Text5: TX_FAR _CeladonMart3Text5 db "@" CeladonMart3Text12 -CeladonMart3Text10: ; 482a1 (12:42a1) -CeladonMart3Text8: ; 482a1 (12:42a1) -CeladonMart3Text6: ; 482a1 (12:42a1) +CeladonMart3Text10: +CeladonMart3Text8: +CeladonMart3Text6: TX_FAR _CeladonMart3Text6 db "@" -CeladonMart3Text7: ; 482a6 (12:42a6) +CeladonMart3Text7: TX_FAR _CeladonMart3Text7 db "@" -CeladonMart3Text9: ; 482ab (12:42ab) +CeladonMart3Text9: TX_FAR _CeladonMart3Text9 db "@" -CeladonMart3Text11: ; 482b0 (12:42b0) +CeladonMart3Text11: TX_FAR _CeladonMart3Text11 db "@" -CeladonMart3Text13: ; 482b5 (12:42b5) +CeladonMart3Text13: TX_FAR _CeladonMart3Text13 db "@" -CeladonMart3Text14: ; 482ba (12:42ba) +CeladonMart3Text14: TX_FAR _CeladonMart3Text14 db "@" -CeladonMart3Text17: ; 482bf (12:42bf) -CeladonMart3Text16: ; 482bf (12:42bf) -CeladonMart3Text15: ; 482bf (12:42bf) +CeladonMart3Text17: +CeladonMart3Text16: +CeladonMart3Text15: TX_FAR _CeladonMart3Text15 db "@" |