Merge remote-tracking branch 'upstream/master'

2015-09-10 01:28:06 +02:00
parent a7cb2a5e9b 2e74d969f7
commit 8ccdd4d6c0
3 changed files with 6 additions and 7 deletions
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -285,7 +285,7 @@ CheckPlayerTurn:
 	cp $80
 	jr nc, .not_confused

-	; clear confussion-dependent substatus
+	; clear confusion-dependent substatus
 	ld hl, PlayerSubStatus3
 	ld a, [hl]
 	and 1 << SUBSTATUS_CONFUSED