diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-24 22:03:01 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-24 22:03:01 -0400 |
| commit | 1746ac03c35fe1f7d1af0ccee5d70bc3672f05ae (patch) | |
| tree | be141ce5604d05bcc919898e659811cbbc160ba1 /engine | |
| parent | 604fc2ada31f430da07debbd39a575bf69821137 (diff) | |
Func_f0a82
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/bank3c.asm | 29 | ||||
| -rw-r--r-- | engine/bank3f.asm | 4 |
2 files changed, 31 insertions, 2 deletions
diff --git a/engine/bank3c.asm b/engine/bank3c.asm index db31842b..fe2d192f 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -293,7 +293,34 @@ Pointer_f0a76:: ; f0a76 (3c:4a76) db $01, $ec, $02, $ed, $03, $ee, $ff Func_f0a82: ; f0a82 - dr $f0a82, $f220e + ld a, [wd472] + bit 7, a + ret z + ld a, [wWalkBikeSurfState] + and a + ret nz + push hl + push bc + callab Func_fcb4d + pop bc + pop hl + ld a, b + cp e + ret nz + push hl + ld a, [wUpdateSpritesEnabled] + push af + ld a, $ff + ld [wUpdateSpritesEnabled], a + callab Func_fd831 + pop af + ld [wUpdateSpritesEnabled], a + pop hl + call Func_159b + callab Func_fcba1 + ret + + dr $f0abf, $f220e INCLUDE "data/mapHeaders/beach_house.asm" INCLUDE "scripts/beach_house.asm" diff --git a/engine/bank3f.asm b/engine/bank3f.asm index 92e6d857..b36a3761 100644 --- a/engine/bank3f.asm +++ b/engine/bank3f.asm @@ -2296,7 +2296,9 @@ Pointer_fd230: ; fd230 (3f:5230) Func_fd252: ; fd252 (3f:5252) dr $fd252,$fd2a1 Func_fd2a1:: ; fd2a1 (3f:52a1) - dr $fd2a1,$fd8ab + dr $fd2a1,$fd831 +Func_fd831: + dr $fd831,$fd8ab Func_fd8ab: ; fd8ab (3f:58ab) dr $fd8ab,$fd8d4 Func_fd8d4: ; fd8d4 (3f:58d4) |