diff options
| author | IIMarckus <iimarckus@gmail.com> | 2016-06-08 05:44:58 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2016-06-08 05:44:58 -0600 |
| commit | 6e8c3883e430b567f7aa8f9230e366e03610bd5a (patch) | |
| tree | ca189f210cb5f404d4791ace04fcd70de6b3a642 /scripts/celadoncity.asm | |
| parent | Fix WRAM address comments beyond the former site of wGBC (diff) | |
| download | pokeyellow-6e8c3883e430b567f7aa8f9230e366e03610bd5a.tar.gz pokeyellow-6e8c3883e430b567f7aa8f9230e366e03610bd5a.tar.xz pokeyellow-6e8c3883e430b567f7aa8f9230e366e03610bd5a.zip | |
Part 1 of syncing with pokered.
Diffstat (limited to 'scripts/celadoncity.asm')
| -rwxr-xr-x | scripts/celadoncity.asm | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/scripts/celadoncity.asm b/scripts/celadoncity.asm index 233b38bd..c36c4ad7 100755 --- a/scripts/celadoncity.asm +++ b/scripts/celadoncity.asm @@ -1,4 +1,4 @@ -CeladonCityScript: ; 19a43 (6:5a43) +CeladonCityScript: call EnableAutoTextBoxDrawing ld hl, CeladonCityScriptPointers ld a, [W_CELADONCITYCURSCRIPT] @@ -13,7 +13,7 @@ CeladonCityScript1: ResetEvent EVENT_67F ret -CeladonCityTextPointers: ; 19966 (6:5966) +CeladonCityTextPointers: dw CeladonCityText1 dw CeladonCityText2 dw CeladonCityText3 @@ -33,23 +33,23 @@ CeladonCityTextPointers: ; 19966 (6:5966) dw CeladonCityText17 dw CeladonCityText18 -CeladonCityText1: ; 1998a (6:598a) +CeladonCityText1: TX_FAR _CeladonCityText1 db "@" -CeladonCityText2: ; 1998f (6:598f) +CeladonCityText2: TX_FAR _CeladonCityText2 db "@" -CeladonCityText3: ; 19994 (6:5994) +CeladonCityText3: TX_FAR _CeladonCityText3 db "@" -CeladonCityText4: ; 19999 (6:5999) +CeladonCityText4: TX_FAR _CeladonCityText4 db "@" -CeladonCityText5: ; 1999e (6:599e) +CeladonCityText5: TX_ASM CheckEvent EVENT_GOT_TM41 jr nz, .asm_7053f @@ -72,70 +72,70 @@ CeladonCityText5: ; 1999e (6:599e) .Done jp TextScriptEnd -TM41PreText: ; 199d2 (6:59d2) +TM41PreText: TX_FAR _TM41PreText db "@" -ReceivedTM41Text: ; 199d7 (6:59d7) +ReceivedTM41Text: TX_FAR _ReceivedTM41Text db $0B, "@" -TM41ExplanationText: ; 199dd (6:59dd) +TM41ExplanationText: TX_FAR _TM41ExplanationText db "@" -TM41NoRoomText: ; 199e2 (6:59e2) +TM41NoRoomText: TX_FAR _TM41NoRoomText db "@" -CeladonCityText6: ; 199e7 (6:59e7) +CeladonCityText6: TX_FAR _CeladonCityText6 db "@" -CeladonCityText7: ; 199ec (6:59ec) +CeladonCityText7: TX_FAR _CeladonCityText7 TX_ASM ld a, POLIWRATH call PlayCry jp TextScriptEnd -CeladonCityText8: ; 199f9 (6:59f9) +CeladonCityText8: TX_FAR _CeladonCityText8 db "@" -CeladonCityText9: ; 199fe (6:59fe) +CeladonCityText9: TX_FAR _CeladonCityText9 db "@" -CeladonCityText10: ; 19a03 (6:5a03) +CeladonCityText10: TX_ASM callba Func_f1ac6 jp TextScriptEnd -CeladonCityText11: ; 19a08 (6:5a08) +CeladonCityText11: TX_FAR _CeladonCityText11 db "@" -CeladonCityText13: ; 19a0d (6:5a0d) +CeladonCityText13: TX_FAR _CeladonCityText13 db "@" -CeladonCityText14: ; 19a12 (6:5a12) +CeladonCityText14: TX_FAR _CeladonCityText14 db "@" -CeladonCityText15: ; 19a17 (6:5a17) +CeladonCityText15: TX_FAR _CeladonCityText15 db "@" -CeladonCityText16: ; 19a1c (6:5a1c) +CeladonCityText16: TX_FAR _CeladonCityText16 db "@" -CeladonCityText17: ; 19a21 (6:5a21) +CeladonCityText17: TX_FAR _CeladonCityText17 db "@" -CeladonCityText18: ; 19a26 (6:5a26) +CeladonCityText18: TX_FAR _CeladonCityText18 db "@" |