diff options
| author | dannye <33dannye@gmail.com> | 2020-11-04 00:06:44 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-11-04 00:06:44 -0600 |
| commit | 5647ca687b92954dcf37a6ea6bfbc9a341c32de4 (patch) | |
| tree | dde1937a1bfdb3a835f4155e1c2eb8f1aaf86f63 /scripts/SafariZoneSecretHouse.asm | |
| parent | Merge pull request #55 from Deokishisu/patch-1 (diff) | |
| download | pokeyellow-5647ca687b92954dcf37a6ea6bfbc9a341c32de4.tar.gz pokeyellow-5647ca687b92954dcf37a6ea6bfbc9a341c32de4.tar.xz pokeyellow-5647ca687b92954dcf37a6ea6bfbc9a341c32de4.zip | |
Sync with pokered
Diffstat (limited to 'scripts/SafariZoneSecretHouse.asm')
| -rwxr-xr-x | scripts/SafariZoneSecretHouse.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/scripts/SafariZoneSecretHouse.asm b/scripts/SafariZoneSecretHouse.asm index 2d9b2305..6eeff8ad 100755 --- a/scripts/SafariZoneSecretHouse.asm +++ b/scripts/SafariZoneSecretHouse.asm @@ -5,41 +5,41 @@ SafariZoneSecretHouse_TextPointers: dw SafariZoneSecretHouseText1 SafariZoneSecretHouseText1: - TX_ASM + text_asm CheckEvent EVENT_GOT_HM03 - jr nz, .asm_20a9b + jr nz, .got_item ld hl, SafariZoneSecretHouseText_4a350 call PrintText - lb bc, HM_03, 1 + lb bc, HM_SURF, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld hl, ReceivedHM03Text call PrintText SetEvent EVENT_GOT_HM03 - jr .asm_8f1fc -.BagFull + jr .done +.bag_full ld hl, HM03NoRoomText call PrintText - jr .asm_8f1fc -.asm_20a9b + jr .done +.got_item ld hl, HM03ExplanationText call PrintText -.asm_8f1fc +.done jp TextScriptEnd SafariZoneSecretHouseText_4a350: - TX_FAR _SecretHouseText_4a350 - db "@" + text_far _SecretHouseText_4a350 + text_end ReceivedHM03Text: - TX_FAR _ReceivedHM03Text - TX_SFX_ITEM_1 - db "@" + text_far _ReceivedHM03Text + sound_get_item_1 + text_end HM03ExplanationText: - TX_FAR _HM03ExplanationText - db "@" + text_far _HM03ExplanationText + text_end HM03NoRoomText: - TX_FAR _HM03NoRoomText - db "@" + text_far _HM03NoRoomText + text_end |