diff options
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/cinnabar_lab.asm | 24 | ||||
| -rw-r--r-- | engine/events/hidden_objects/safari_game.asm | 2 |
2 files changed, 13 insertions, 13 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: diff --git a/engine/events/hidden_objects/safari_game.asm b/engine/events/hidden_objects/safari_game.asm index 2863a201..e7d1a729 100644 --- a/engine/events/hidden_objects/safari_game.asm +++ b/engine/events/hidden_objects/safari_game.asm @@ -48,7 +48,7 @@ SafariZoneGameOver: ldh [hWarpDestinationMap], a ld a, $3 ld [wDestinationWarpID], a - ld a, $5 + ld a, SCRIPT_SAFARIZONEGATE_LEAVING_SAFARI ld [wSafariZoneGateCurScript], a SetEvent EVENT_SAFARI_GAME_OVER ld a, 1 |