aboutsummaryrefslogtreecommitdiffstats
path: root/engine
diff options
context:
space:
mode:
authorRangi42 <remy.oukaour+rangi42@gmail.com>2023-11-18 19:44:03 -0500
committerRangi42 <remy.oukaour+rangi42@gmail.com>2023-11-18 19:44:03 -0500
commit26a342b104e48bede16b9e2324c2f8f57df5bd50 (patch)
tree47dc8ca18fa2bbc8aee0f52c99d710d50ef45bd6 /engine
parent.calculateHPBarCoords incorrectly referenced OAM (diff)
downloadpokeyellow-26a342b104e48bede16b9e2324c2f8f57df5bd50.tar.gz
pokeyellow-26a342b104e48bede16b9e2324c2f8f57df5bd50.tar.xz
pokeyellow-26a342b104e48bede16b9e2324c2f8f57df5bd50.zip
Identify more map script labels
Diffstat (limited to 'engine')
-rw-r--r--engine/events/cinnabar_lab.asm24
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: