diff options
| author | obskyr <powpowd@gmail.com> | 2018-07-03 04:50:33 +0200 |
|---|---|---|
| committer | obskyr <powpowd@gmail.com> | 2018-07-03 04:50:33 +0200 |
| commit | 382fd4b50e27cea7e0f97839363235ea2eac14fa (patch) | |
| tree | d9836c547ac68f14a4b1766453334812380d050b /engine/events | |
| parent | d26c5f6937518f891d7cb699e237e172588f4a26 (diff) | |
| parent | 2dfc7fc635b13291588ba8aae65fd0ece7211799 (diff) | |
Merge branch 'collisions-movements' of https://github.com/Pokeglitch/pokegold-spaceworld into master
And that's the last of the manual merges for now! Hooray!
Diffstat (limited to 'engine/events')
| -rwxr-xr-x | engine/events/field_moves.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index 49729d2..f6e53a3 100755 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -248,7 +248,7 @@ SurfScript: ; 03:5145 call MenuTextBoxBackup
ld a, PLAYER_SURF
ld [wPlayerState], a
- call Function0d02
+ call RedrawPlayerSprite
call PlayMapMusic
call MovePlayerIntoWater
call Function1fea
|