From 185b0a1c86e442d9c3ecd38d7c3fc7cfdb24be21 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 23 Jul 2015 03:41:52 -0400 Subject: Wild Pokemon functions and data Replaced encounter rates with percent values Added new constants denoting the number of wild Pokemon in the grass and water wild constructs Annotated and relabeled the encounter generating functions Renamed a WRAM address associaed with the temporary storage of the wild Pokemon's species Moved spawn constants to constants/map_constants.asm for use anywhere in the disassembly --- home/map_objects.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'home/map_objects.asm') diff --git a/home/map_objects.asm b/home/map_objects.asm index 4f22c6203..1071ff01c 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 -- cgit v1.2.3