diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /engine/events/cinnabar_lab.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/events/cinnabar_lab.asm')
| -rw-r--r-- | engine/events/cinnabar_lab.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engine/events/cinnabar_lab.asm b/engine/events/cinnabar_lab.asm index 547f782e..545baf13 100644 --- a/engine/events/cinnabar_lab.asm +++ b/engine/events/cinnabar_lab.asm @@ -52,40 +52,40 @@ GiveFossilToCinnabarLab:: ld a, b ld [wFossilMon], a call LoadFossilItemAndMonName - ld hl, LabFossil_610ae + ld hl, .ScientistSeesFossilText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a jr nz, .cancelledGivingFossil - ld hl, LabFossil_610b3 + ld hl, .ScientistTakesFossilText call PrintText ld a, [wFossilItem] ldh [hItemToRemoveID], a farcall RemoveItemByID - ld hl, LabFossil_610b8 + ld hl, .GoForAWalkText call PrintText SetEvents EVENT_GAVE_FOSSIL_TO_LAB, EVENT_LAB_STILL_REVIVING_FOSSIL ret .cancelledGivingFossil - ld hl, LabFossil_610bd + ld hl, .ComeAgainText call PrintText ret -LabFossil_610ae: - text_far _Lab4Text_610ae +.ScientistSeesFossilText: + text_far _CinnabarLabFossilRoomScientist1SeesFossilText text_end -LabFossil_610b3: - text_far _Lab4Text_610b3 +.ScientistTakesFossilText: + text_far _CinnabarLabFossilRoomScientist1TakesFossilText text_end -LabFossil_610b8: - text_far _Lab4Text_610b8 +.GoForAWalkText: + text_far _CinnabarLabFossilRoomScientist1GoForAWalkText2 text_end -LabFossil_610bd: - text_far _Lab4Text_610bd +.ComeAgainText: + text_far _CinnabarLabFossilRoomScientist1ComeAgainText text_end PrintFossilsInBag: |