nerge with master, fix conflicts

2017-12-16 01:08:55 +01:00
parent 039c9f4bd8 224fdbf026
commit 44abbae60b
189 changed files with 20685 additions and 24533 deletions
@@ -293,7 +293,7 @@ PetalburgWoods_EventScript_22E284:: @ 822E284
 PetalburgWoods_EventScript_22E2C5:: @ 822E2C5
 	special sub_80B4808
 	waitmovement 0
-	checkflag FLAG_0x12F
+	checkflag FLAG_HAS_MATCH_CALL
 	goto_eq PetalburgWoods_EventScript_22E2D6
 	release
 	end
@@ -308,7 +308,7 @@ PetalburgWoods_EventScript_22E2D6:: @ 822E2D6
 	end

 PetalburgWoods_EventScript_22E2EF:: @ 822E2EF
-	checkflag FLAG_0x12F
+	checkflag FLAG_HAS_MATCH_CALL
 	goto_eq PetalburgWoods_EventScript_22E302
 	msgbox PetalburgWoods_Text_22E889, 4
 	release