Merge branch 'master' into clone-union

2022-08-17 15:41:50 -04:00
parent 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 changed files with 12564 additions and 12748 deletions
@@ -8,8 +8,8 @@ SSAnne_2F_Room1_EventScript_Gentleman::
 	waitmessage
 	setvar VAR_0x8004, SPECIES_SNORLAX
 	special SetSeenMon
-	drawmonpic SPECIES_SNORLAX, 10, 3
+	showmonpic SPECIES_SNORLAX, 10, 3
 	waitbuttonpress
-	erasemonpic
+	hidemonpic
 	release
 	end