diff options
| author | vulcandth <vulcandth@gmail.com> | 2023-07-13 20:27:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 21:27:56 -0400 |
| commit | d001ced41b53271373753de835a9c3b3413dc318 (patch) | |
| tree | ff2db7f403bddfcdeb12e50def8411cafedcdd5e /scripts/SSAnneCaptainsRoom.asm | |
| parent | Make wCurrentBoxNum a byte instead of word (#414) (diff) | |
| download | pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.gz pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.xz pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.zip | |
Add macros, constants, and labels for map scripts and text (#367)
This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
Diffstat (limited to 'scripts/SSAnneCaptainsRoom.asm')
| -rw-r--r-- | scripts/SSAnneCaptainsRoom.asm | 59 |
1 files changed, 30 insertions, 29 deletions
diff --git a/scripts/SSAnneCaptainsRoom.asm b/scripts/SSAnneCaptainsRoom.asm index d618a69e..da094261 100644 --- a/scripts/SSAnneCaptainsRoom.asm +++ b/scripts/SSAnneCaptainsRoom.asm @@ -1,8 +1,8 @@ SSAnneCaptainsRoom_Script: - call SSAnne7Script_6189b + call SSAnneCaptainsRoomEventScript jp EnableAutoTextBoxDrawing -SSAnne7Script_6189b: +SSAnneCaptainsRoomEventScript: CheckEvent EVENT_RUBBED_CAPTAINS_BACK ret nz ld hl, wd72d @@ -10,84 +10,85 @@ SSAnne7Script_6189b: ret SSAnneCaptainsRoom_TextPointers: - dw SSAnne7Text1 - dw SSAnne7Text2 - dw SSAnne7Text3 + def_text_pointers + dw_const SSAnneCaptainsRoomCaptainText, TEXT_SSANNECAPTAINSROOM_CAPTAIN + dw_const SSAnneCaptainsRoomTrashText, TEXT_SSANNECAPTAINSROOM_TRASH + dw_const SSAnneCaptainsRoomSeasickBookText, TEXT_SSANNECAPTAINSROOM_SEASICK_BOOK -SSAnne7Text1: +SSAnneCaptainsRoomCaptainText: text_asm CheckEvent EVENT_GOT_HM01 jr nz, .got_item - ld hl, SSAnne7RubText + ld hl, SSAnneCaptainsRoomRubCaptainsBackText call PrintText - ld hl, ReceivingHM01Text + ld hl, SSAnneCaptainsRoomCaptainIFeelMuchBetterText call PrintText lb bc, HM_CUT, 1 call GiveItem jr nc, .bag_full - ld hl, ReceivedHM01Text + ld hl, SSAnneCaptainsRoomCaptainReceivedHM01Text call PrintText SetEvent EVENT_GOT_HM01 jr .done .bag_full - ld hl, HM01NoRoomText + ld hl, SSAnneCaptainsRoomCaptainHM01NoRoomText call PrintText ld hl, wd72d set 5, [hl] jr .done .got_item - ld hl, SSAnne7Text_61932 + ld hl, SSAnneCaptainsRoomCaptainNotSickAnymoreText call PrintText .done jp TextScriptEnd -SSAnne7RubText: - text_far _SSAnne7RubText +SSAnneCaptainsRoomRubCaptainsBackText: + text_far _SSAnneCaptainsRoomRubCaptainsBackText text_asm ld a, [wAudioROMBank] cp BANK("Audio Engine 3") ld [wAudioSavedROMBank], a - jr nz, .asm_61908 + jr nz, .not_audio_engine_3 ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound ld a, BANK(Music_PkmnHealed) ld [wAudioROMBank], a -.asm_61908 +.not_audio_engine_3 ld a, MUSIC_PKMN_HEALED ld [wNewSoundID], a call PlaySound -.asm_61910 +.loop ld a, [wChannelSoundIDs] cp MUSIC_PKMN_HEALED - jr z, .asm_61910 + jr z, .loop call PlayDefaultMusic SetEvent EVENT_RUBBED_CAPTAINS_BACK ld hl, wd72d res 5, [hl] jp TextScriptEnd -ReceivingHM01Text: - text_far _ReceivingHM01Text +SSAnneCaptainsRoomCaptainIFeelMuchBetterText: + text_far _SSAnneCaptainsRoomCaptainIFeelMuchBetterText text_end -ReceivedHM01Text: - text_far _ReceivedHM01Text +SSAnneCaptainsRoomCaptainReceivedHM01Text: + text_far _SSAnneCaptainsRoomCaptainReceivedHM01Text sound_get_key_item text_end -SSAnne7Text_61932: - text_far _SSAnne7Text_61932 +SSAnneCaptainsRoomCaptainNotSickAnymoreText: + text_far _SSAnneCaptainsRoomCaptainNotSickAnymoreText text_end -HM01NoRoomText: - text_far _HM01NoRoomText +SSAnneCaptainsRoomCaptainHM01NoRoomText: + text_far _SSAnneCaptainsRoomCaptainHM01NoRoomText text_end -SSAnne7Text2: - text_far _SSAnne7Text2 +SSAnneCaptainsRoomTrashText: + text_far _SSAnneCaptainsRoomTrashText text_end -SSAnne7Text3: - text_far _SSAnne7Text3 +SSAnneCaptainsRoomSeasickBookText: + text_far _SSAnneCaptainsRoomSeasickBookText text_end |