summaryrefslogtreecommitdiff
path: root/scripts/CinnabarLabFossilRoom.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/CinnabarLabFossilRoom.asm')
-rwxr-xr-xscripts/CinnabarLabFossilRoom.asm28
1 files changed, 14 insertions, 14 deletions
diff --git a/scripts/CinnabarLabFossilRoom.asm b/scripts/CinnabarLabFossilRoom.asm
index f5f03a19..2c388119 100755
--- a/scripts/CinnabarLabFossilRoom.asm
+++ b/scripts/CinnabarLabFossilRoom.asm
@@ -44,10 +44,10 @@ FossilsList:
db DOME_FOSSIL
db HELIX_FOSSIL
db OLD_AMBER
- db $00
+ db 0 ; end
Lab4Text1:
- TX_ASM
+ text_asm
CheckEvent EVENT_GAVE_FOSSIL_TO_LAB
jr nz, .asm_75d96
ld hl, Lab4Text_75dc6
@@ -56,7 +56,7 @@ Lab4Text1:
ld a, [wFilteredBagItemsCount]
and a
jr z, .asm_75d8d
- callba GiveFossilToCinnabarLab
+ farcall GiveFossilToCinnabarLab
jr .asm_75d93
.asm_75d8d
ld hl, Lab4Text_75dcb
@@ -83,27 +83,27 @@ Lab4Text1:
jr .asm_75d93
Lab4Text_75dc6:
- TX_FAR _Lab4Text_75dc6
- db "@"
+ text_far _Lab4Text_75dc6
+ text_end
Lab4Text_75dcb:
- TX_FAR _Lab4Text_75dcb
- db "@"
+ text_far _Lab4Text_75dcb
+ text_end
Lab4Text_75dd0:
- TX_FAR _Lab4Text_75dd0
- db "@"
+ text_far _Lab4Text_75dd0
+ text_end
Lab4Text_75dd5:
- TX_FAR _Lab4Text_75dd5
- db "@"
+ text_far _Lab4Text_75dd5
+ text_end
Lab4Text2:
- TX_ASM
- ld a, $3
+ text_asm
+ ld a, TRADE_FOR_SAILOR
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd
LoadFossilItemAndMonNameBank1D:
- jpba LoadFossilItemAndMonName
+ farjp LoadFossilItemAndMonName