Sync with pokered

1 files changed, 79 insertions, 79 deletions

diff --git a/scripts/ViridianCity2.asm b/scripts/ViridianCity2.asm
index ffaeb4e2..c2e8254e 100755
--- a/scripts/ViridianCity2.asm
+++ b/scripts/ViridianCity2.asm
@@ -1,33 +1,33 @@
-Func_f18bb:
+Func_f18bb::
 	ld hl, ViridianCityText_f18c2
 	call PrintText
 	ret
 
 ViridianCityText_f18c2:
-	TX_FAR _ViridianCityText1
-	db "@"
+	text_far _ViridianCityText1
+	text_end
 
-Func_f18c7:
-	ld hl, ViridianCityText_f18e4
+Func_f18c7::
+	ld hl, ViridianCityText_19127
 	ld a, [wObtainedBadges]
-	cp %01111111
-	jr z, .printAndDone
+	cp $ff ^ (1 << BIT_EARTHBADGE)
+	jr z, .done
 	CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
-	jr nz, .printAndDone
-	ld hl, ViridianCityText_f18df
-.printAndDone
+	jr nz, .done
+	ld hl, ViridianCityText_19122
+.done
 	call PrintText
 	ret
 
-ViridianCityText_f18df:
-	TX_FAR _ViridianCityText_19122
-	db "@"
+ViridianCityText_19122:
+	text_far _ViridianCityText_19122
+	text_end
 
-ViridianCityText_f18e4:
-	TX_FAR _ViridianCityText_19127
-	db "@"
+ViridianCityText_19127:
+	text_far _ViridianCityText_19127
+	text_end
 
-Func_f18e9:
+Func_f18e9::
 	ld hl, ViridianCityText_f1902
 	call PrintText
 	call YesNoChoice
@@ -41,18 +41,18 @@ Func_f18e9:
 	ret
 
 ViridianCityText_f1902:
-	TX_FAR _ViridianCityText_1914d
-	db "@"
+	text_far _ViridianCityText_1914d
+	text_end
 
 ViridianCityText_f1907:
-	TX_FAR _ViridianCityText_19152
-	db "@"
+	text_far _ViridianCityText_19152
+	text_end
 
 ViridianCityText_f190c:
-	TX_FAR _ViridianCityText_19157
-	db "@"
+	text_far _ViridianCityText_19157
+	text_end
 
-Func_f1911:
+Func_f1911::
 	ld hl, ViridianCityText_f1927
 	CheckEvent EVENT_GOT_POKEDEX
 	jr nz, .gotPokedex
@@ -62,14 +62,14 @@ Func_f1911:
 	ret
 
 ViridianCityText_f1922:
-	TX_FAR _ViridianCityText_19175
-	db "@"
+	text_far _ViridianCityText_19175
+	text_end
 
 ViridianCityText_f1927:
-	TX_FAR _ViridianCityText_1917a
-	db "@"
+	text_far _ViridianCityText_1917a
+	text_end
 
-Func_f192c:
+Func_f192c::
 	ld hl, ViridianCityText_f1945
 	call PrintText
 	call StartSimulatingJoypadStates
@@ -82,48 +82,48 @@ Func_f192c:
 	ret
 
 ViridianCityText_f1945:
-	TX_FAR _ViridianCityText_19191
-	db "@"
+	text_far _ViridianCityText_19191
+	text_end
 
-Func_f194a:
+Func_f194a::
 	CheckEvent EVENT_GOT_TM42
-	jr nz, .gotTm42
-	ld hl, ViridianCityText_f1979
+	jr nz, .got_item
+	ld hl, ViridianCityText_191ca
 	call PrintText
-	lb bc, TM_42, 1
+	lb bc, TM_DREAM_EATER, 1
 	call GiveItem
-	jr nc, .BagFull
-	ld hl, ViridianCityText_f197e
+	jr nc, .bag_full
+	ld hl, ReceivedTM42Text
 	call PrintText
 	SetEvent EVENT_GOT_TM42
 	ret
-.BagFull
-	ld hl, ViridianCityText_f1989
+.bag_full
+	ld hl, TM42NoRoomText
 	call PrintText
 	ret
-.gotTm42
-	ld hl, ViridianCityText_f1984
+.got_item
+	ld hl, TM42Explanation
 	call PrintText
 	ret
 
-ViridianCityText_f1979:
-	TX_FAR _ViridianCityText_191ca
-	db "@"
+ViridianCityText_191ca:
+	text_far _ViridianCityText_191ca
+	text_end
 
-ViridianCityText_f197e:
-	TX_FAR _ReceivedTM42Text
-	TX_SFX_ITEM_2
-	db "@"
+ReceivedTM42Text:
+	text_far _ReceivedTM42Text
+	sound_get_item_2
+	text_end
 
-ViridianCityText_f1984:
-	TX_FAR _TM42Explanation
-	db "@"
+TM42Explanation:
+	text_far _TM42Explanation
+	text_end
 
-ViridianCityText_f1989:
-	TX_FAR _TM42NoRoomText
-	db "@"
+TM42NoRoomText:
+	text_far _TM42NoRoomText
+	text_end
 
-Func_f198e:
+Func_f198e::
 	ld hl, ViridianCityText_f19b6
 	call PrintText
 	ld c, 2
@@ -131,77 +131,77 @@ Func_f198e:
 	call YesNoChoice
 	ld a, [wCurrentMenuItem]
 	and a
-	jr nz, .hurry
+	jr nz, .refused
 	ld hl, ViridianCityText_f19bb
 	call PrintText
 	ld a, $3
 	ld [wViridianCityCurScript], a
 	jr .done
-.hurry
+.refused
 	ld hl, ViridianCityText_f19c0
 	call PrintText
 .done
 	ret
 
 ViridianCityText_f19b6:
-	TX_FAR _OldManAgainText1
-	db "@"
+	text_far _OldManAgainText1
+	text_end
 
 ViridianCityText_f19bb:
-	TX_FAR _OldManAgainText2
-	db "@"
+	text_far _OldManAgainText2
+	text_end
 
 ViridianCityText_f19c0:
-	TX_FAR _OldManAgainText3
-	db "@"
+	text_far _OldManAgainText3
+	text_end
 
-Func_f19c5:
+Func_f19c5::
 	ld hl, ViridianCityText_f19cc
 	call PrintText
 	ret
 
 ViridianCityText_f19cc:
-	TX_FAR _ViridianCityText8
-	db "@"
+	text_far _ViridianCityText8
+	text_end
 
-Func_f19d1:
+Func_f19d1::
 	ld hl, ViridianCityText_f19d8
 	call PrintText
 	ret
 
 ViridianCityText_f19d8:
-	TX_FAR _ViridianCityText9
-	db "@"
+	text_far _ViridianCityText9
+	text_end
 
-Func_f19dd:
+Func_f19dd::
 	ld hl, ViridianCityText_f19e4
 	call PrintText
 	ret
 
 ViridianCityText_f19e4:
-	TX_FAR _ViridianCityText10
-	db "@"
+	text_far _ViridianCityText10
+	text_end
 
-Func_f19e9:
+Func_f19e9::
 	ld hl, ViridianCityText_f19f0
 	call PrintText
 	ret
 
 ViridianCityText_f19f0:
-	TX_FAR _ViridianCityText13
-	db "@"
+	text_far _ViridianCityText13
+	text_end
 
-Func_f19f5:
+Func_f19f5::
 	ld hl, ViridianCityText_f19fc
 	call PrintText
 	ret
 
 ViridianCityText_f19fc:
-	TX_FAR _ViridianCityText14
-	db "@"
+	text_far _ViridianCityText14
+	text_end
 
 
-Func_f1a01:
+Func_f1a01::
 	ld hl, Data_f1a0a
 	ld b, SPRITE_FACING_RIGHT
 	call TryApplyPikachuMovementData