Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214

# Conflicts:
#	src/battle_main.c
#	src/field_specials.c
#	src/trade.c

data/maps/BirthIsland_Exterior/scripts.inc

@@ -48,21 +48,24 @@ BirthIsland_Exterior_EventScript_Triangle::
 	special DoDeoxysRockInteraction
 	waitstate
 	switch VAR_RESULT
-	case 0, BirthIsland_Exterior_EventScript_NotSolved1
-	case 1, BirthIsland_Exterior_EventScript_NotSolved2
-	case 2, BirthIsland_Exterior_EventScript_Deoxys
-	case 3, BirthIsland_Exterior_EventScript_NotSolved3
+	case DEOXYS_ROCK_FAILED,     BirthIsland_Exterior_EventScript_Failed
+	case DEOXYS_ROCK_PROGRESSED, BirthIsland_Exterior_EventScript_Progressed
+	case DEOXYS_ROCK_SOLVED,     BirthIsland_Exterior_EventScript_Deoxys
+	case DEOXYS_ROCK_COMPLETE,   BirthIsland_Exterior_EventScript_Complete
 	end
 
-BirthIsland_Exterior_EventScript_NotSolved1::
+@ The actual rock triangle movement is handled by DoDeoxysRockInteraction.
+@ Unless the player has solved the puzzle and needs to encounter Deoxys,
+@ there's nothing else the script needs to do.
+BirthIsland_Exterior_EventScript_Failed::
 	release
 	end
 
-BirthIsland_Exterior_EventScript_NotSolved2::
+BirthIsland_Exterior_EventScript_Progressed::
 	release
 	end
 
-BirthIsland_Exterior_EventScript_NotSolved3::
+BirthIsland_Exterior_EventScript_Complete::
 	release
 	end
 

data/maps/PetalburgCity/scripts.inc

@@ -38,7 +38,7 @@ PetalburgCity_OnFrame:
 PetalburgCity_EventScript_WallyTutorial::
 	lockall
 	special SavePlayerParty
-	special PutZigzagoonInPlayerParty
+	special LoadWallyZigzagoon
 	applymovement LOCALID_WALLY, PetalburgCity_Movement_WallyTutorialWally
 	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WallyTutorialPlayer
 	waitmovement 0