From 5647ca687b92954dcf37a6ea6bfbc9a341c32de4 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Wed, 4 Nov 2020 00:06:44 -0600
Subject: Sync with pokered

---
 scripts/CeladonDiner2.asm | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'scripts/CeladonDiner2.asm')

diff --git a/scripts/CeladonDiner2.asm b/scripts/CeladonDiner2.asm
index 8cd66a19..ceef9f52 100755
--- a/scripts/CeladonDiner2.asm
+++ b/scripts/CeladonDiner2.asm
@@ -1,38 +1,38 @@
-Func_f1f31:
+Func_f1f31::
 	CheckEvent EVENT_GOT_COIN_CASE
-	jr nz, .asm_eb14d
+	jr nz, .got_item
 	ld hl, CeladonDinerText_491a7
 	call PrintText
 	lb bc, COIN_CASE, 1
 	call GiveItem
-	jr nc, .BagFull
+	jr nc, .bag_full
 	SetEvent EVENT_GOT_COIN_CASE
 	ld hl, ReceivedCoinCaseText
 	call PrintText
-	jr .asm_68b61
-.BagFull
+	jr .done
+.bag_full
 	ld hl, CoinCaseNoRoomText
 	call PrintText
-	jr .asm_68b61
-.asm_eb14d
+	jr .done
+.got_item
 	ld hl, CeladonDinerText_491b7
 	call PrintText
-.asm_68b61
+.done
 	ret
 
 CeladonDinerText_491a7:
-	TX_FAR _CeladonDinerText_491a7
-	db "@"
+	text_far _CeladonDinerText_491a7
+	text_end
 
 ReceivedCoinCaseText:
-	TX_FAR _ReceivedCoinCaseText
-	TX_SFX_KEY_ITEM
-	db "@"
+	text_far _ReceivedCoinCaseText
+	sound_get_key_item
+	text_end
 
 CoinCaseNoRoomText:
-	TX_FAR _CoinCaseNoRoomText
-	db "@"
+	text_far _CoinCaseNoRoomText
+	text_end
 
 CeladonDinerText_491b7:
-	TX_FAR _CeladonDinerText_491b7
-	db "@"
+	text_far _CeladonDinerText_491b7
+	text_end
-- 
cgit v1.2.3