Merge branch 'master' into secret_base

1 files changed, 47 insertions, 47 deletions

diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index fcf32d15d..9e219a339 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -1,5 +1,5 @@
-BerryTreeScript:: @ 81A14DD
-	special 43
+S_BerryTree:: @ 81A14DD
+	special FieldObjectInteractionGetBerryTreeData
 	switch 0x8004
 	case 255, Route102_EventScript_1A1533
 	case 0, Route102_EventScript_1A153D
@@ -13,7 +13,7 @@ BerryTreeScript:: @ 81A14DD
 Route102_EventScript_1A1533:: @ 81A1533
 	lockall
 	message Route102_Text_1A1946
-	waittext
+	waitmessage
 	waitbutton
 	releaseall
 	end
@@ -21,11 +21,11 @@ Route102_EventScript_1A1533:: @ 81A1533
 Route102_EventScript_1A153D:: @ 81A153D
 	lock
 	faceplayer
-	specialval RESULT, 49
+	specialvar RESULT, PlayerHasBerries
 	compare RESULT, 1
-	jumpeq Route102_EventScript_1A1558
+	goto_if_eq Route102_EventScript_1A1558
 	message Route102_Text_1A16B6
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
@@ -33,18 +33,18 @@ Route102_EventScript_1A153D:: @ 81A153D
 Route102_EventScript_1A1558:: @ 81A1558
 	msgbox Route102_Text_1A16CD, 5
 	compare RESULT, 1
-	jumpeq Route102_EventScript_1A1577
+	goto_if_eq Route102_EventScript_1A1577
 	compare RESULT, 0
-	jumpeq Route102_EventScript_1A1593
+	goto_if_eq Route102_EventScript_1A1593
 	end
 
 Route102_EventScript_1A1577:: @ 81A1577
 	fadescreen 1
-	closebutton
-	special 44
+	closemessage
+	special sub_80B4EE4
 	waitstate
 	compare ITEM_ID, 0
-	jumpeq Route102_EventScript_1A1593
+	goto_if_eq Route102_EventScript_1A1593
 	removeitem ITEM_ID, 1
 	call Route102_EventScript_1A16A9
 
@@ -55,91 +55,91 @@ Route102_EventScript_1A1593:: @ 81A1593
 Route102_EventScript_1A1595:: @ 81A1595
 	lockall
 	message Route102_Text_1A172C
-	waittext
+	waitmessage
 	waitbutton
-	jump Route102_EventScript_1A165F
+	goto Route102_EventScript_1A165F
 
 Route102_EventScript_1A15A2:: @ 81A15A2
 	lockall
 	message Route102_Text_1A174B
-	waittext
+	waitmessage
 	waitbutton
-	jump Route102_EventScript_1A165F
+	goto Route102_EventScript_1A165F
 
 Route102_EventScript_1A15AF:: @ 81A15AF
 	lockall
 	message Route102_Text_1A175C
-	waittext
+	waitmessage
 	waitbutton
-	jump Route102_EventScript_1A165F
+	goto Route102_EventScript_1A165F
 
 Route102_EventScript_1A15BC:: @ 81A15BC
 	call Route102_EventScript_1A15CE
 	lockall
 	message Route102_Text_1A177D
-	waittext
+	waitmessage
 	waitbutton
-	jump Route102_EventScript_1A165F
+	goto Route102_EventScript_1A165F
 
 Route102_EventScript_1A15CE:: @ 81A15CE
 	compare 0x8005, 0
-	jumpeq Route102_EventScript_1A15F2
+	goto_if_eq Route102_EventScript_1A15F2
 	compare 0x8005, 4
-	jumpeq Route102_EventScript_1A15EB
-	buffertext 1, Route102_Text_1A17B7
+	goto_if_eq Route102_EventScript_1A15EB
+	getstring 1, Route102_Text_1A17B7
 	return
 
 Route102_EventScript_1A15EB:: @ 81A15EB
-	buffertext 1, Route102_Text_1A179F
+	getstring 1, Route102_Text_1A179F
 	return
 
 Route102_EventScript_1A15F2:: @ 81A15F2
-	buffertext 1, Route102_Text_1A17B0
+	getstring 1, Route102_Text_1A17B0
 	return
 
 Route102_EventScript_1A15F9:: @ 81A15F9
-	buffernum 1, 0x8006
+	getnumberstring 1, 0x8006
 	lock
 	faceplayer
 	msgbox Route102_Text_1A17C0, 5
 	compare RESULT, 1
-	jumpeq Route102_EventScript_1A161D
+	goto_if_eq Route102_EventScript_1A161D
 	compare RESULT, 0
-	jumpeq Route102_EventScript_1A164B
+	goto_if_eq Route102_EventScript_1A164B
 
 Route102_EventScript_1A161D:: @ 81A161D
-	special 46
+	special FieldObjectInteractionPickBerryTree
 	compare 0x8004, 0
-	jumpeq Route102_EventScript_1A1642
-	special 47
+	goto_if_eq Route102_EventScript_1A1642
+	special FieldObjectInteractionRemoveBerryTree
 	message Route102_Text_1A17FD
-	fanfare 387
-	waittext
+	playfanfare 387
+	waitmessage
 	waitfanfare
 	waitbutton
 	message Route102_Text_1A181A
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
 
 Route102_EventScript_1A1642:: @ 81A1642
 	message Route102_Text_1A1881
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
 
 Route102_EventScript_1A164B:: @ 81A164B
 	message Route102_Text_1A18C5
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
 
 gUnknown_081A1654:: @ 81A1654
 	lockall
-	special 43
+	special FieldObjectInteractionGetBerryTreeData
 	call Route102_EventScript_1A16A9
 	releaseall
 	end
@@ -147,37 +147,37 @@ gUnknown_081A1654:: @ 81A1654
 Route102_EventScript_1A165F:: @ 81A165F
 	checkitem ITEM_WAILMER_PAIL, 1
 	compare RESULT, 0
-	jumpeq Route102_EventScript_1A168D
+	goto_if_eq Route102_EventScript_1A168D
 	msgbox Route102_Text_1A18E6, 5
 	compare RESULT, 1
-	jumpeq Route102_EventScript_1A1693
+	goto_if_eq Route102_EventScript_1A1693
 	compare RESULT, 0
-	jumpeq Route102_EventScript_1A168D
+	goto_if_eq Route102_EventScript_1A168D
 
 Route102_EventScript_1A168D:: @ 81A168D
 	releaseall
 	end
 
 gUnknown_081A168F:: @ 81A168F
-	special 43
+	special FieldObjectInteractionGetBerryTreeData
 	lockall
 
 Route102_EventScript_1A1693:: @ 81A1693
 	message Route102_Text_1A1912
-	waittext
-	special 48
-	special 94
+	waitmessage
+	special FieldObjectInteractionWaterBerryTree
+	special DoWateringBerryTreeAnim
 	waitstate
 	message Route102_Text_1A1925
-	waittext
+	waitmessage
 	waitbutton
 	releaseall
 	end
 
 Route102_EventScript_1A16A9:: @ 81A16A9
-	special 45
-	inccounter GAME_STAT_PLANTED_BERRIES
+	special FieldObjectInteractionPlantBerryTree
+	incrementgamestat GAME_STAT_PLANTED_BERRIES
 	message Route102_Text_1A16FB
-	waittext
+	waitmessage
 	waitbutton
 	return