From ed29db5841849345c5971a9b08681dfb6560c07d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 29 Oct 2015 23:32:11 -0400 Subject: No more -bash000; engine/movement.asm, SPRITEMOVEFN --- engine/events.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/events.asm') diff --git a/engine/events.asm b/engine/events.asm index 961a7f517..e60f08b9a 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -606,7 +606,7 @@ TryObjectEvent: ; 969b5 .IsObject call PlayTalkObject - ld a, [hConnectedMapWidth] + ld a, [hMapObjectIndexBuffer2] call GetObjectStruct ld hl, OBJECT_MAP_OBJECT_INDEX add hl, bc -- cgit v1.2.3 From 31c407bb3de7328f9e80f006052c23ffcfbbfe39 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 1 Nov 2015 12:44:30 -0500 Subject: Buena local labels --- engine/events.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/events.asm') diff --git a/engine/events.asm b/engine/events.asm index e60f08b9a..1b937dcf0 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -947,11 +947,11 @@ SelectMenuCallback: ; 96b66 ; 96b72 .Script ; 96b72 - ptjump wd0e8 + ptjump wQueuedScriptBank ; 96b75 .Asm ; 96b75 - ptcallasm wd0e8 + ptcallasm wQueuedScriptBank end ; 96b79 -- cgit v1.2.3 From d35cfad0de085fab1b0c40c7f0497c9b745cb7b2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Nov 2015 11:15:32 -0500 Subject: object_struct --- engine/events.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/events.asm') diff --git a/engine/events.asm b/engine/events.asm index 5e64b62fd..20e2bc0dd 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -396,7 +396,7 @@ CheckTileEvent: ; 96874 ret .return6 - ld a, [StandingTile] + ld a, [PlayerStandingTile] call CheckPitTile jr nz, .pittile ld a, 6 @@ -606,7 +606,7 @@ TryObjectEvent: ; 969b5 .IsObject call PlayTalkObject - ld a, [hMapObjectIndexBuffer2] + ld a, [hObjectStructIndexBuffer] call GetObjectStruct ld hl, OBJECT_MAP_OBJECT_INDEX add hl, bc -- cgit v1.2.3