Merge remote-tracking branch 'upstream/master'

This commit is contained in:
JimB16
2015-10-07 20:38:24 +02:00
23 changed files with 1333 additions and 1277 deletions

View File

@@ -382,7 +382,7 @@ CheckTileEvent: ; 96874
call CheckBit4_ScriptFlags3
jr z, .ok
call Function97cc0
call RockSmashEncounter
ret c
jr .ok
@@ -582,7 +582,7 @@ CheckAPressOW: ; 96999
ret c
call TryReadSign
ret c
call Function97c5f
call CheckFacingTileEvent
ret c
xor a
ret