diff options
Diffstat (limited to 'scripts/celadoncity.asm')
| -rwxr-xr-x | scripts/celadoncity.asm | 72 |
1 files changed, 34 insertions, 38 deletions
diff --git a/scripts/celadoncity.asm b/scripts/celadoncity.asm index 004d8773..6ef679dc 100755 --- a/scripts/celadoncity.asm +++ b/scripts/celadoncity.asm @@ -1,13 +1,10 @@ -CeladonCityScript: ; 19956 (6:5956) +CeladonCityScript: call EnableAutoTextBoxDrawing - ld hl, wd77e - res 0, [hl] - res 7, [hl] - ld hl, wd816 - res 7, [hl] + ResetEvents EVENT_1B8, EVENT_1BF + ResetEvent EVENT_67F ret -CeladonCityTextPointers: ; 19966 (6:5966) +CeladonCityTextPointers: dw CeladonCityText1 dw CeladonCityText2 dw CeladonCityText3 @@ -27,30 +24,29 @@ 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) - db $08 ; asm - ld a, [wd777] - bit 0, a - jr nz, .asm_7053f ; 0x199a4 +CeladonCityText5: + TX_ASM + CheckEvent EVENT_GOT_TM41 + jr nz, .asm_7053f ld hl, TM41PreText call PrintText - ld bc, (TM_41 << 8) | 1 + lb bc, TM_41, 1 call GiveItem jr c, .Success ld hl, TM41NoRoomText @@ -59,78 +55,78 @@ CeladonCityText5: ; 1999e (6:599e) .Success ld hl, ReceivedTM41Text call PrintText - ld hl, wd777 - set 0, [hl] + SetEvent EVENT_GOT_TM41 jr .Done -.asm_7053f ; 0x199c9 +.asm_7053f ld hl, TM41ExplanationText call PrintText .Done jp TextScriptEnd -TM41PreText: ; 199d2 (6:59d2) +TM41PreText: TX_FAR _TM41PreText db "@" -ReceivedTM41Text: ; 199d7 (6:59d7) +ReceivedTM41Text: TX_FAR _ReceivedTM41Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" -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 - db $08 ; asm + 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_FAR _CeladonCityText10 db "@" -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 "@" |