Merge with master

data/scripts/contest_hall.inc

@@ -542,7 +542,7 @@ ContestHall_EventScript_AudienceHeartEmotes:: @ 827A34F
 
 ContestHall_EventScript_DisplayHearts:: @ 827A3E5
 	setvar VAR_RESULT, 8
-	special ScriptRandom
+	special GenerateContestRand
 	compare VAR_RESULT, 0
 	call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember1
 	compare VAR_RESULT, 1

data/scripts/field_move_scripts.inc

@@ -1,4 +1,4 @@
-
+@ Interact with cuttable tree
 EventScript_CutTree:: @ 82906BB
 	lockall
 	goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut
@@ -18,7 +18,8 @@ EventScript_CutTree:: @ 82906BB
 	goto EventScript_CutTreeDown
 	end
 
-EventScript_FldEffCut:: @ 8290705
+@ Use cut from party menu
+EventScript_UseCut:: @ 8290705
 	lockall
 	dofieldeffect FLDEFF_USE_CUT_ON_TREE
 	waitstate
@@ -58,6 +59,7 @@ Text_CantCut: @ 829077D
 	.string "This tree looks like it can be\n"
 	.string "CUT down!$"
 
+@ Interact with smashable rock
 EventScript_RockSmash:: @ 82907A6
 	lockall
 	goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock
@@ -77,7 +79,8 @@ EventScript_RockSmash:: @ 82907A6
 	goto EventScript_SmashRock
 	end
 
-EventScript_FldEffRockSmash:: @ 82907F0
+@ Use rock smash from party menu
+EventScript_UseRockSmash:: @ 82907F0
 	lockall
 	dofieldeffect FLDEFF_USE_ROCK_SMASH
 	waitstate
@@ -89,10 +92,10 @@ EventScript_SmashRock:: @ 82907FB
 	waitmovement 0
 	removeobject VAR_LAST_TALKED
 	specialvar VAR_RESULT, TryUpdateRusturfTunnelState
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq EventScript_EndSmash
 	special RockSmashWildEncounter
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq EventScript_EndSmash
 	waitstate
 	releaseall
@@ -141,7 +144,7 @@ EventScript_StrengthBoulder:: @ 82908BA
 	goto EventScript_ActivateStrength
 	end
 
-EventScript_FldEffStrength:: @ 82908FD
+EventScript_UseStrength:: @ 82908FD
 	lockall
 	dofieldeffect FLDEFF_USE_STRENGTH
 	waitstate

data/scripts/flash.inc

@@ -1,4 +1,4 @@
-EventScript_FldEffFlash:: @ 82926F8
+EventScript_UseFlash:: @ 82926F8
 	animateflash 1
 	setflashradius 1
 	end

data/scripts/new_game.inc

@@ -115,7 +115,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
 	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4
 	setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
 	setflag FLAG_HIDE_PETALBURG_GYM_GREETER
-	setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE
+	setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_DAD
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
@@ -142,7 +142,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
 	setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE
 	setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA
 	setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
-	setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
+	setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD
 	setflag FLAG_HIDE_PETALBURG_GYM_WALLY
 	setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE

data/scripts/roulette.inc

@@ -6,7 +6,7 @@ Roulette_EventScript_Table1:: @ 82A5AB1
 	getpricereduction POKENEWS_GAME_CORNER
 	compare VAR_RESULT, FALSE
 	goto_if_eq Roulette_EventScript_Play
-	addvar VAR_0x8004, 128
+	addvar VAR_0x8004, ROULETTE_SPECIAL_RATE
 	goto Roulette_EventScript_Play
 	end
 
@@ -18,7 +18,7 @@ Roulette_EventScript_Table2:: @ 82A5ADF
 	getpricereduction POKENEWS_GAME_CORNER
 	compare VAR_RESULT, FALSE
 	goto_if_eq Roulette_EventScript_Play
-	addvar VAR_0x8004, 128
+	addvar VAR_0x8004, ROULETTE_SPECIAL_RATE
 	goto Roulette_EventScript_Play
 	end
 

data/scripts/trainer_hill.inc

@@ -32,8 +32,8 @@ EventScript_TrainerHillTimer:: @ 82C8393
 
 TrainerHill_1F_EventScript_DummyWarpToEntranceCounter:: @ 82C83A6
 	setvar VAR_TEMP_2, 1
-	trainerhill_clearresult
-	compare VAR_RESULT, 1  @ VAR_RESULT always 0 here
+	trainerhill_getusingereader
+	compare VAR_RESULT, TRUE  @ VAR_RESULT always FALSE here
 	goto_if_eq TrainerHill_1F_EventScript_WarpSilentToEntranceCounter
 	end