Sync with pokered

1 files changed, 52 insertions, 52 deletions

diff --git a/scripts/CeladonMartRoof.asm b/scripts/CeladonMartRoof.asm
index 64871bdd..1d39670d 100755
--- a/scripts/CeladonMartRoof.asm
+++ b/scripts/CeladonMartRoof.asm
@@ -39,7 +39,7 @@ CeladonMartRoofDrinkList:
 	db FRESH_WATER
 	db SODA_POP
 	db LEMONADE
-	db $00
+	db 0 ; end
 
 CeladonMartRoofScript_GiveDrinkToGirl:
 	ld hl, wd730
@@ -65,7 +65,7 @@ CeladonMartRoofScript_GiveDrinkToGirl:
 	dec l
 	ld b, l
 	ld c, 12
-	coord hl, 0, 0
+	hlcoord 0, 0
 	call TextBoxBorder
 	call UpdateSprites
 	call CeladonMartRoofScript_PrintDrinksInBag
@@ -80,7 +80,7 @@ CeladonMartRoofScript_GiveDrinkToGirl:
 	ld e, a
 	add hl, de
 	ld a, [hl]
-	ld [hItemToRemoveID], a
+	ldh [hItemToRemoveID], a
 	cp FRESH_WATER
 	jr z, .gaveFreshWater
 	cp SODA_POP
@@ -91,7 +91,7 @@ CeladonMartRoofScript_GiveDrinkToGirl:
 	ld hl, CeladonMartRoofText_48515
 	call PrintText
 	call RemoveItemByIDBank12
-	lb bc, TM_49, 1
+	lb bc, TM_TRI_ATTACK, 1
 	call GiveItem
 	jr nc, .bagFull
 	ld hl, ReceivedTM49Text
@@ -104,7 +104,7 @@ CeladonMartRoofScript_GiveDrinkToGirl:
 	ld hl, CeladonMartRoofText_48504
 	call PrintText
 	call RemoveItemByIDBank12
-	lb bc, TM_48, 1
+	lb bc, TM_ROCK_SLIDE, 1
 	call GiveItem
 	jr nc, .bagFull
 	ld hl, CeladonMartRoofText_4850a
@@ -117,7 +117,7 @@ CeladonMartRoofScript_GiveDrinkToGirl:
 	ld hl, CeladonMartRoofText_484f3
 	call PrintText
 	call RemoveItemByIDBank12
-	lb bc, TM_13, 1
+	lb bc, TM_ICE_BEAM, 1
 	call GiveItem
 	jr nc, .bagFull
 	ld hl, CeladonMartRoofText_484f9
@@ -134,63 +134,63 @@ CeladonMartRoofScript_GiveDrinkToGirl:
 	ret
 
 RemoveItemByIDBank12:
-	callba RemoveItemByID
+	farcall RemoveItemByID
 	ret
 
 CeladonMartRoofText_484ee:
-	TX_FAR _CeladonMartRoofText_484ee
-	db "@"
+	text_far _CeladonMartRoofText_484ee
+	text_end
 
 CeladonMartRoofText_484f3:
-	TX_FAR _CeladonMartRoofText_484f3
-	TX_WAIT
-	db "@"
+	text_far _CeladonMartRoofText_484f3
+	text_waitbutton
+	text_end
 
 CeladonMartRoofText_484f9:
-	TX_FAR _CeladonMartRoofText_484f9
-	TX_SFX_ITEM_1
-	TX_FAR _CeladonMartRoofText_484fe
-	TX_WAIT
-	db "@"
+	text_far _CeladonMartRoofText_484f9
+	sound_get_item_1
+	text_far _CeladonMartRoofText_484fe
+	text_waitbutton
+	text_end
 
 CeladonMartRoofText_48504:
-	TX_FAR _CeladonMartRoofText_48504
-	TX_WAIT
-	db "@"
+	text_far _CeladonMartRoofText_48504
+	text_waitbutton
+	text_end
 
 CeladonMartRoofText_4850a:
-	TX_FAR _CeladonMartRoofText_4850a
-	TX_SFX_ITEM_1
-	TX_FAR _CeladonMartRoofText_4850f
-	TX_WAIT
-	db "@"
+	text_far _CeladonMartRoofText_4850a
+	sound_get_item_1
+	text_far _CeladonMartRoofText_4850f
+	text_waitbutton
+	text_end
 
 CeladonMartRoofText_48515:
-	TX_FAR _CeladonMartRoofText_48515
-	TX_WAIT
-	db "@"
+	text_far _CeladonMartRoofText_48515
+	text_waitbutton
+	text_end
 
 ReceivedTM49Text:
-	TX_FAR _ReceivedTM49Text
-	TX_SFX_ITEM_1
-	TX_FAR _CeladonMartRoofText_48520
-	TX_WAIT
-	db "@"
+	text_far _ReceivedTM49Text
+	sound_get_item_1
+	text_far _CeladonMartRoofText_48520
+	text_waitbutton
+	text_end
 
 CeladonMartRoofText_48526:
-	TX_FAR _CeladonMartRoofText_48526
-	TX_WAIT
-	db "@"
+	text_far _CeladonMartRoofText_48526
+	text_waitbutton
+	text_end
 
 CeladonMartRoofText_4852c:
-	TX_FAR _CeladonMartRoofText_4852c
-	TX_WAIT
-	db "@"
+	text_far _CeladonMartRoofText_4852c
+	text_waitbutton
+	text_end
 
 CeladonMartRoofScript_PrintDrinksInBag:
 	ld hl, wFilteredBagItems
 	xor a
-	ld [hItemCounter], a
+	ldh [hItemCounter], a
 .loop
 	ld a, [hli]
 	cp $ff
@@ -198,8 +198,8 @@ CeladonMartRoofScript_PrintDrinksInBag:
 	push hl
 	ld [wd11e], a
 	call GetItemName
-	coord hl, 2, 2
-	ld a, [hItemCounter]
+	hlcoord 2, 2
+	ldh a, [hItemCounter]
 	ld bc, SCREEN_WIDTH * 2
 	call AddNTimes
 	ld de, wcd6d
@@ -218,11 +218,11 @@ CeladonMartRoof_TextPointers:
 	dw CeladonMartRoofText6
 
 CeladonMartRoofText1:
-	TX_FAR _CeladonMartRoofText1
-	db "@"
+	text_far _CeladonMartRoofText1
+	text_end
 
 CeladonMartRoofText2:
-	TX_ASM
+	text_asm
 	call CeladonMartRoofScript_GetDrinksInBag
 	ld a, [wFilteredBagItemsCount]
 	and a
@@ -244,16 +244,16 @@ CeladonMartRoofText2:
 	jp TextScriptEnd
 
 CeladonMartRoofText3:
-	TX_FAR _CeladonMartRoofText_48598
-	db "@"
+	text_far _CeladonMartRoofText_48598
+	text_end
 
 CeladonMartRoofText4:
-	TX_FAR _CeladonMartRoofText4
-	db "@"
+	text_far _CeladonMartRoofText4
+	text_end
 
 CeladonMartRoofText5:
-	TX_VENDING_MACHINE
+	script_vending_machine
 
 CeladonMartRoofText6:
-	TX_FAR _CeladonMartRoofText6
-	db "@"
+	text_far _CeladonMartRoofText6
+	text_end