diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-06-11 08:44:34 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-06-11 08:44:34 -0400 |
| commit | 9062e78b640ae5aa412e7d5f405d874305d61ada (patch) | |
| tree | f312f74e62b857d588ca9dc88a43ff140954d673 | |
| parent | 314a0978f8006c927b59ae966346004789e06e0d (diff) | |
Another gap bites the dust
| -rw-r--r-- | home/map.asm | 29 | ||||
| -rw-r--r-- | shim.sym | 1 | ||||
| -rw-r--r-- | wram.asm | 3 |
3 files changed, 26 insertions, 7 deletions
diff --git a/home/map.asm b/home/map.asm index 4e40fe6..643ba1a 100644 --- a/home/map.asm +++ b/home/map.asm @@ -447,11 +447,32 @@ FadeIn:: ; 23e5 ; This is not OverworldFadeIn, but I don't know what it is callab OverworldFadeIn ret -Function2407:: ; 2407 - ; TODO - +Function2407:: ; 00:2407 + ld a, $2a + ld [wcb77], a + xor a + ld [wPlayerAction], a + ld a, [wPlayerFacing] + and $c + ld [wPlayerFacing], a + ld a, [wPlayerStandingTile] + and $f0 + cp $70 + ret nz + ld a, [wPlayerStandingTile] + cp $72 + ret z + cp $70 + ret z + cp $78 + ret z + ld a, $0 + ld [wPlayerFacing], a + ld a, $0 + ld d, $0 + call Function19c0 + ret -SECTION "Map stuff", ROM0[$2439] MapSetup_Connection:: ; 2439 call EnterMapConnection call CopyMapPartialAndAttributes @@ -1,5 +1,4 @@ ; ROM0 -00:2C05 StartMenuCheck 00:2F1D Function2f1d 00:3111 Function3111 00:3171 Function3171 @@ -242,8 +242,7 @@ wVBCopyFarSize:: ds 1 ; cb71 wVBCopyFarSrc:: ds 2 ; cb72 wVBCopyFarDst:: ds 2 ; cb74 wVBCopyFarSrcBank:: ds 1 ; cb76 - db - +wcb77:: db ; cb77 wMovementObject:: db ; cb78 ptrba wMovementData ; cb79 |