diff options
| author | yenatch <yenatch@gmail.com> | 2015-08-17 11:58:57 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-08-17 11:58:57 -0400 |
| commit | 3cd79c55a3e1b50c8a71ad76692342e52382c700 (patch) | |
| tree | 32a9feb55a0eadc24c4690cef4fd0d26b2032f00 /home/map_objects.asm | |
| parent | 9974a2c7014cbe7db3d0e516580fea48001ab3df (diff) | |
| parent | 4831b4429eab57f56cce4736b6930a54f07314f7 (diff) | |
Merge pull request #309 from PikalaxALT/master
Wild data, save functions, fix missing include
Diffstat (limited to 'home/map_objects.asm')
| -rw-r--r-- | home/map_objects.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/home/map_objects.asm b/home/map_objects.asm index 2b7bd9a92..ac363b31d 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -84,7 +84,7 @@ Function184a:: ; 184a ret ; 1852 -Function1852:: ; 1852 +CheckOnWater:: ; 1852 ld a, [StandingTile] call GetTileCollision sub 1 @@ -147,7 +147,7 @@ Function1875:: ; 1875 ret ; 188e -Function188e:: ; 188e +CheckSuperTallGrassTile:: ; 188e cp $14 ret z cp $1c @@ -549,7 +549,7 @@ Function1a71:: ; 1a71 ld d, 0 ld hl, ObjectStruct3_Data + 1 rept OBJECT_STRUCT_3_DATA_WIDTH - add hl,de + add hl, de endr ld b, h ld c, l @@ -623,7 +623,7 @@ ResetVramState_Bit0:: ; 1acc ; 1ad2 -DrawOnMap:: ; 1ad2 +UpdateSprites:: ; 1ad2 ld a, [VramState] bit 0, a ret z |