From 4fa6c6daa46935c7580a60a22bd9216414246dc0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 16 Oct 2015 13:35:43 -0400 Subject: Split up bank 2; other relabelings --- engine/map_objects.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/map_objects.asm') diff --git a/engine/map_objects.asm b/engine/map_objects.asm index d9282d965..f4eef1ab8 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -3137,7 +3137,7 @@ Function5803:: ; 5803 Function5815: ; 5815 call Function18de ret c - ld a, [$ffb0] + ld a, [hConnectedMapWidth] ld [wd4cd], a ret ; 581f @@ -3166,7 +3166,7 @@ Function582c: ; 582c ld hl, OBJECT_09 add hl, bc ld [hl], 0 - ld a, [$ffb0] + ld a, [hConnectedMapWidth] ld [wd4ce], a ret ; 5847 -- cgit v1.2.3 From 119d6b411922eb7b375691b81fc97c9b334f4167 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Oct 2015 10:34:19 -0400 Subject: About time I got to these functions --- engine/map_objects.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/map_objects.asm') diff --git a/engine/map_objects.asm b/engine/map_objects.asm index f4eef1ab8..d73ebd142 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -2196,7 +2196,7 @@ Function4ecd: ; 4ecd add hl, bc ld a, [hl] ld b, a - callba Function807e + callba CopyDECoordsToMapObject pop bc ld hl, OBJECT_FLAGS add hl, bc @@ -3064,7 +3064,7 @@ Function579d: ; 579d ; 57bc Function57bc: ; 57bc - ld hl, wd45b + ld hl, wPlayerSpriteSetupFlags bit 7, [hl] jr nz, .ok ret @@ -3076,10 +3076,10 @@ Function57bc: ; 57bc ; 57ca Function57ca: ; 57ca - ld hl, wd45b + ld hl, wPlayerSpriteSetupFlags bit 5, [hl] ret z - ld a, [wd45b] + ld a, [wPlayerSpriteSetupFlags] and 3 rept 2 add a -- cgit v1.2.3