fixing merge conflicts

1 files changed, 106 insertions, 108 deletions

diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index e1add8734..4b21aa99b 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -1,36 +1,36 @@
 FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604
-	setvar 0x8008, 4
-	setvar 0x8009, 1
-	move 0x8008, FallarborTown_ContestLobby_Movement_1B7821
-	waitmove 0
-	jump FallarborTown_ContestLobby_EventScript_1B7681
+	setvar VAR_SPECIAL_8, 4
+	setvar VAR_SPECIAL_9, 1
+	applymovement VAR_SPECIAL_8, FallarborTown_ContestLobby_Movement_1B7821
+	waitmovement 0
+	goto FallarborTown_ContestLobby_EventScript_1B7681
 	end
 
 SlateportCity_ContestLobby_EventScript_1B761E:: @ 81B761E
-	setvar 0x8008, 2
-	setvar 0x8009, 2
-	move 6, SlateportCity_ContestLobby_Movement_1A083D
-	move 0x8008, SlateportCity_ContestLobby_Movement_1B7821
-	waitmove 0
-	jump SlateportCity_ContestLobby_EventScript_1B7681
+	setvar VAR_SPECIAL_8, 2
+	setvar VAR_SPECIAL_9, 2
+	applymovement 6, SlateportCity_ContestLobby_Movement_1A083D
+	applymovement VAR_SPECIAL_8, SlateportCity_ContestLobby_Movement_1B7821
+	waitmovement 0
+	goto SlateportCity_ContestLobby_EventScript_1B7681
 	end
 
 VerdanturfTown_ContestLobby_EventScript_1B763F:: @ 81B763F
-	setvar 0x8008, 2
-	setvar 0x8009, 1
-	move 0x8008, VerdanturfTown_ContestLobby_Movement_1B7821
-	waitmove 0
-	jump VerdanturfTown_ContestLobby_EventScript_1B7681
+	setvar VAR_SPECIAL_8, 2
+	setvar VAR_SPECIAL_9, 1
+	applymovement VAR_SPECIAL_8, VerdanturfTown_ContestLobby_Movement_1B7821
+	waitmovement 0
+	goto VerdanturfTown_ContestLobby_EventScript_1B7681
 	end
 
 LilycoveCity_ContestLobby_EventScript_1B7659:: @ 81B7659
-	setvar 0x8008, 3
-	setvar 0x8009, 3
-	move 9, LilycoveCity_ContestLobby_Movement_1A083D
-	move 10, LilycoveCity_ContestLobby_Movement_1A083D
-	move 0x8008, LilycoveCity_ContestLobby_Movement_1B7821
-	waitmove 0
-	jump LilycoveCity_ContestLobby_EventScript_1B7681
+	setvar VAR_SPECIAL_8, 3
+	setvar VAR_SPECIAL_9, 3
+	applymovement 9, LilycoveCity_ContestLobby_Movement_1A083D
+	applymovement 10, LilycoveCity_ContestLobby_Movement_1A083D
+	applymovement VAR_SPECIAL_8, LilycoveCity_ContestLobby_Movement_1B7821
+	waitmovement 0
+	goto LilycoveCity_ContestLobby_EventScript_1B7681
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7681:: @ 81B7681
@@ -38,26 +38,26 @@ LilycoveCity_ContestLobby_EventScript_1B7681:: @ 81B7681
 SlateportCity_ContestLobby_EventScript_1B7681:: @ 81B7681
 VerdanturfTown_ContestLobby_EventScript_1B7681:: @ 81B7681
 	lockall
-	msgbox FallarborTown_ContestLobby_Text_1B6E63, 5
-	compare RESULT, 1
-	jumpeq FallarborTown_ContestLobby_EventScript_1B76A1
-	compare RESULT, 0
-	jumpeq FallarborTown_ContestLobby_EventScript_1B76E5
+	msgbox FallarborTown_ContestLobby_Text_1B6E63, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B76A1
+	compare RESULT, NO
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B76E5
 	end
 
 FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1
 	checkitem ITEM_POKEBLOCK_CASE, 1
 	compare RESULT, 0
-	jumpeq FallarborTown_ContestLobby_EventScript_1B7780
-	specialval RESULT, PlayerHasBerries
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B7780
+	specialvar RESULT, PlayerHasBerries
 	compare RESULT, 0
-	jumpeq FallarborTown_ContestLobby_EventScript_1B770E
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E
 	msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4
-	specialval RESULT, sub_810CA00
-	compare RESULT, 65535
-	jumpif 5, FallarborTown_ContestLobby_EventScript_1B76EF
-	compare RESULT, 65535
-	jumpeq FallarborTown_ContestLobby_EventScript_1B7776
+	specialvar RESULT, GetFirstFreePokeblockSlot
+	compare RESULT, -1
+	goto_if_ne FallarborTown_ContestLobby_EventScript_1B76EF
+	compare RESULT, -1
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B7776
 	end
 
 FallarborTown_ContestLobby_EventScript_1B76E5:: @ 81B76E5
@@ -66,35 +66,34 @@ FallarborTown_ContestLobby_EventScript_1B76E5:: @ 81B76E5
 	end
 
 FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF
-	msgbox FallarborTown_ContestLobby_Text_1B6ED0, 5
-	compare RESULT, 1
-	jumpeq FallarborTown_ContestLobby_EventScript_1B7734
-	compare RESULT, 0
-	jumpeq FallarborTown_ContestLobby_EventScript_1B7726
+	msgbox FallarborTown_ContestLobby_Text_1B6ED0, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B7734
+	compare RESULT, NO
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B7726
 	end
 
 FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E
 	msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4
-	checkdailyflags
-	checkflag 2241
-	jumpeq FallarborTown_ContestLobby_EventScript_1B774F
-	jump FallarborTown_ContestLobby_EventScript_1B7759
+	dodailyevents
+	goto_if_set FLAG_DAILY_RECEIVED_BERRY_FALLARBOR, FallarborTown_ContestLobby_EventScript_1B774F
+	goto FallarborTown_ContestLobby_EventScript_1B7759
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7726:: @ 81B7726
 	msgbox FallarborTown_ContestLobby_Text_1B6F1F, 4
-	jump FallarborTown_ContestLobby_EventScript_1B7734
+	goto FallarborTown_ContestLobby_EventScript_1B7734
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734
 	msgbox FallarborTown_ContestLobby_Text_1B6EF1, 4
-	jump FallarborTown_ContestLobby_EventScript_1B7742
+	goto FallarborTown_ContestLobby_EventScript_1B7742
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742
-	copyvar 0x8004, 0x8009
+	copyvar VAR_SPECIAL_4, VAR_SPECIAL_9
 	fadescreen 1
-	special sub_804E538
+	special DoBerryBlending
 	waitstate
 	releaseall
 	end
@@ -106,9 +105,9 @@ FallarborTown_ContestLobby_EventScript_1B774F:: @ 81B774F
 
 FallarborTown_ContestLobby_EventScript_1B7759:: @ 81B7759
 	msgbox FallarborTown_ContestLobby_Text_1B704A, 4
-	giveitem ITEM_PECHA_BERRY
-	setflag 2241
-	jump FallarborTown_ContestLobby_EventScript_1B76EF
+	giveitem_std ITEM_PECHA_BERRY
+	setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
+	goto FallarborTown_ContestLobby_EventScript_1B76EF
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7776:: @ 81B7776
@@ -122,23 +121,23 @@ FallarborTown_ContestLobby_EventScript_1B7780:: @ 81B7780
 	end
 
 FallarborTown_ContestLobby_EventScript_1B778A:: @ 81B778A
-	setvar 0x8008, 4
-	jump FallarborTown_ContestLobby_EventScript_1B77B6
+	setvar VAR_SPECIAL_8, 4
+	goto FallarborTown_ContestLobby_EventScript_1B77B6
 	end
 
 SlateportCity_ContestLobby_EventScript_1B7795:: @ 81B7795
-	setvar 0x8008, 2
-	jump SlateportCity_ContestLobby_EventScript_1B77B6
+	setvar VAR_SPECIAL_8, 2
+	goto SlateportCity_ContestLobby_EventScript_1B77B6
 	end
 
 VerdanturfTown_ContestLobby_EventScript_1B77A0:: @ 81B77A0
-	setvar 0x8008, 2
-	jump VerdanturfTown_ContestLobby_EventScript_1B77B6
+	setvar VAR_SPECIAL_8, 2
+	goto VerdanturfTown_ContestLobby_EventScript_1B77B6
 	end
 
 LilycoveCity_ContestLobby_EventScript_1B77AB:: @ 81B77AB
-	setvar 0x8008, 3
-	jump LilycoveCity_ContestLobby_EventScript_1B77B6
+	setvar VAR_SPECIAL_8, 3
+	goto LilycoveCity_ContestLobby_EventScript_1B77B6
 	end
 
 FallarborTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6
@@ -148,11 +147,11 @@ VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6
 	lock
 	faceplayer
 	msgbox FallarborTown_ContestLobby_Text_1B742F, 4
-	specialval RESULT, PlayerHasBerries
+	specialvar RESULT, PlayerHasBerries
 	compare RESULT, 1
-	jumpeq FallarborTown_ContestLobby_EventScript_1B77DC
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B77DC
 	compare RESULT, 0
-	jumpeq FallarborTown_ContestLobby_EventScript_1B77E6
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B77E6
 	end
 
 FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC
@@ -161,10 +160,9 @@ FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC
 	end
 
 FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6
-	checkdailyflags
-	checkflag 2241
-	jumpeq FallarborTown_ContestLobby_EventScript_1B77F6
-	jump FallarborTown_ContestLobby_EventScript_1B7800
+	dodailyevents
+	goto_if_set FLAG_DAILY_RECEIVED_BERRY_FALLARBOR, FallarborTown_ContestLobby_EventScript_1B77F6
+	goto FallarborTown_ContestLobby_EventScript_1B7800
 	end
 
 FallarborTown_ContestLobby_EventScript_1B77F6:: @ 81B77F6
@@ -174,8 +172,8 @@ FallarborTown_ContestLobby_EventScript_1B77F6:: @ 81B77F6
 
 FallarborTown_ContestLobby_EventScript_1B7800:: @ 81B7800
 	msgbox FallarborTown_ContestLobby_Text_1B74B4, 4
-	giveitem ITEM_PECHA_BERRY
-	setflag 2241
+	giveitem_std ITEM_PECHA_BERRY
+	setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
 	msgbox FallarborTown_ContestLobby_Text_1B753A, 4
 	release
 	end
@@ -188,19 +186,19 @@ VerdanturfTown_ContestLobby_Movement_1B7821:: @ 81B7821
 	step_end
 
 FallarborTown_ContestLobby_EventScript_1B7823:: @ 81B7823
-	jump FallarborTown_ContestLobby_EventScript_1B783B
+	goto FallarborTown_ContestLobby_EventScript_1B783B
 	end
 
 SlateportCity_ContestLobby_EventScript_1B7829:: @ 81B7829
-	jump SlateportCity_ContestLobby_EventScript_1B783B
+	goto SlateportCity_ContestLobby_EventScript_1B783B
 	end
 
 VerdanturfTown_ContestLobby_EventScript_1B782F:: @ 81B782F
-	jump VerdanturfTown_ContestLobby_EventScript_1B783B
+	goto VerdanturfTown_ContestLobby_EventScript_1B783B
 	end
 
 LilycoveCity_ContestLobby_EventScript_1B7835:: @ 81B7835
-	jump LilycoveCity_ContestLobby_EventScript_1B783B
+	goto LilycoveCity_ContestLobby_EventScript_1B783B
 	end
 
 FallarborTown_ContestLobby_EventScript_1B783B:: @ 81B783B
@@ -208,25 +206,25 @@ LilycoveCity_ContestLobby_EventScript_1B783B:: @ 81B783B
 SlateportCity_ContestLobby_EventScript_1B783B:: @ 81B783B
 VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B
 	lockall
-	specialval RESULT, PlayerHasBerries
+	specialvar RESULT, PlayerHasBerries
 	compare RESULT, 0
-	jumpeq FallarborTown_ContestLobby_EventScript_1B7897
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B7897
 	checkitem ITEM_POKEBLOCK_CASE, 1
 	compare RESULT, 0
-	jumpeq FallarborTown_ContestLobby_EventScript_1B7942
-	specialval RESULT, sub_810CA00
-	compare RESULT, 65535
-	jumpif 5, FallarborTown_ContestLobby_EventScript_1B7878
-	compare RESULT, 65535
-	jumpeq FallarborTown_ContestLobby_EventScript_1B7938
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942
+	specialvar RESULT, GetFirstFreePokeblockSlot
+	compare RESULT, -1
+	goto_if_ne FallarborTown_ContestLobby_EventScript_1B7878
+	compare RESULT, -1
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B7938
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7878:: @ 81B7878
-	msgbox FallarborTown_ContestLobby_Text_1B727C, 5
-	compare RESULT, 1
-	jumpeq FallarborTown_ContestLobby_EventScript_1B78A1
-	compare RESULT, 0
-	jumpeq FallarborTown_ContestLobby_EventScript_1B7936
+	msgbox FallarborTown_ContestLobby_Text_1B727C, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B78A1
+	compare RESULT, NO
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897
@@ -235,48 +233,48 @@ FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897
 	end
 
 FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1
-	call FallarborTown_ContestLobby_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
-	jumpeq FallarborTown_ContestLobby_EventScript_1B7936
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936
 	message FallarborTown_ContestLobby_Text_1B7304
-	waittext
+	waitmessage
 	special sub_8083614
 	waitstate
 	compare RESULT, 1
-	jumpeq FallarborTown_ContestLobby_EventScript_1B7980
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B7980
 	compare RESULT, 2
-	jumpeq FallarborTown_ContestLobby_EventScript_1B794C
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B794C
 	compare RESULT, 3
-	jumpeq FallarborTown_ContestLobby_EventScript_1B7959
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B7959
 	compare RESULT, 5
-	jumpeq FallarborTown_ContestLobby_EventScript_1B7966
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B7966
 	compare RESULT, 6
-	jumpeq FallarborTown_ContestLobby_EventScript_1B7973
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1B7973
 	end
 
 FallarborTown_ContestLobby_EventScript_1B78F3:: @ 81B78F3
 	msgbox FallarborTown_ContestLobby_Text_1B733B, 4
-	jump FallarborTown_ContestLobby_EventScript_1B791D
+	goto FallarborTown_ContestLobby_EventScript_1B791D
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7901:: @ 81B7901
 	msgbox FallarborTown_ContestLobby_Text_1B7347, 4
-	jump FallarborTown_ContestLobby_EventScript_1B791D
+	goto FallarborTown_ContestLobby_EventScript_1B791D
 	end
 
 FallarborTown_ContestLobby_EventScript_1B790F:: @ 81B790F
 	msgbox FallarborTown_ContestLobby_Text_1B735A, 4
-	jump FallarborTown_ContestLobby_EventScript_1B791D
+	goto FallarborTown_ContestLobby_EventScript_1B791D
 	end
 
 FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D
-	setvar 0x8004, 0
+	setvar VAR_SPECIAL_4, 0
 	fadescreen 1
-	disappear 240
-	disappear 239
-	disappear 238
-	disappear 237
-	special sub_804E538
+	removeobject 240
+	removeobject 239
+	removeobject 238
+	removeobject 237
+	special DoBerryBlending
 	waitstate
 	releaseall
 	end
@@ -321,16 +319,16 @@ FallarborTown_ContestLobby_EventScript_1B7973:: @ 81B7973
 
 FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980
 	fadescreen 1
-	specialval RESULT, GetLinkPartnerNames
-	copyvar 0x8008, RESULT
-	copyvar 0x8004, 0x8008
+	specialvar RESULT, GetLinkPartnerNames
+	copyvar VAR_SPECIAL_8, RESULT
+	copyvar VAR_SPECIAL_4, VAR_SPECIAL_8
 	special SpawnBerryBlenderLinkPlayerSprites
-	jump FallarborTown_ContestLobby_EventScript_1B799A
+	goto FallarborTown_ContestLobby_EventScript_1B799A
 	end
 
 FallarborTown_ContestLobby_EventScript_1B799A:: @ 81B799A
 	fadescreen 0
-	switch 0x8008
+	switch VAR_SPECIAL_8
 	case 2, FallarborTown_ContestLobby_EventScript_1B78F3
 	case 3, FallarborTown_ContestLobby_EventScript_1B7901
 	case 4, FallarborTown_ContestLobby_EventScript_1B790F