From e0d6e9ca7acf8a23ad70fad405ddf1073dcd4291 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Nov 2015 12:54:27 -0500 Subject: Fix NorthMapObjectIndexBuffer etc --- engine/events_2.asm | 8 ++++---- engine/scripting.asm | 13 +++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'engine') diff --git a/engine/events_2.asm b/engine/events_2.asm index 1849bbbf8..16739d9f3 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -351,24 +351,24 @@ Function97df9:: ; 97df9 Function97e08:: ; 97e08 ld hl, wd6de xor a -.asm_97e0c +.loop ld [hMapObjectIndexBuffer], a ld a, [hl] and a - jr z, .asm_97e19 + jr z, .skip push hl ld b, h ld c, l call Function97e79 pop hl -.asm_97e19 +.skip ld de, $0006 add hl, de ld a, [hMapObjectIndexBuffer] inc a cp $4 - jr nz, .asm_97e0c + jr nz, .loop ret ; 97e25 diff --git a/engine/scripting.asm b/engine/scripting.asm index 4461c8fe4..5a3895038 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1209,28 +1209,29 @@ ApplyPersonFacing: ; 0x9728b call SetSpriteDirection ld hl, VramState bit 6, [hl] - jr nz, .asm_972b5 ; 0x972b0 $3 - call Function972bc -.asm_972b5 + jr nz, .text_state ; 0x972b0 $3 + call .DisableTextTiles +.text_state call UpdateSprites ret + .not_visible pop de scf ret ; 0x972bc -Function972bc: ; 0x972bc +.DisableTextTiles: ; 0x972bc call Function217a hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT -.asm_972c5 +.loop res 7, [hl] inc hl dec bc ld a, b or c - jr nz, .asm_972c5 ; 0x972cb $f8 + jr nz, .loop ; 0x972cb $f8 ret ; 0x972ce -- cgit v1.2.3