Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefix wram labels with w, part 2.

Browse Source
This commit is contained in:
luckytyphlosion
2018-01-23 17:39:09 -05:00
parent 79bd48f85c
commit a1951cefc0
323 changed files with 8581 additions and 8581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
engine/npc_movement.asm
View File

@@ -235,14 +235,14 @@ CheckFacingObject:: ; 6fd9
call CheckCounterTile
jr nz, .asm_6ff1
ld a, [PlayerStandingMapX]
ld a, [wPlayerStandingMapX]
sub d
cpl
inc a
add d
ld d, a
ld a, [PlayerStandingMapY]
ld a, [wPlayerStandingMapY]
sub e
cpl
inc a
@@ -250,7 +250,7 @@ CheckFacingObject:: ; 6fd9
ld e, a
.asm_6ff1
ld bc, ObjectStructs ; redundant
ld bc, wObjectStructs ; redundant
ld a, 0
ld [hMapObjectIndexBuffer], a
call IsNPCAtCoord
@@ -317,7 +317,7 @@ Unreferenced_Function7015:
; 7041
IsNPCAtCoord: ; 7041
ld bc, ObjectStructs
ld bc, wObjectStructs
xor a
.loop
ld [hObjectStructIndexBuffer], a
@@ -454,7 +454,7 @@ HasObjectReachedMovementLimit: ; 70a4
IsObjectMovingOffEdgeOfScreen: ; 70ed
ld hl, OBJECT_NEXT_MAP_X
add hl, bc
ld a, [XCoord]
ld a, [wXCoord]
cp [hl]
jr z, .check_y
jr nc, .yes
@@ -465,7 +465,7 @@ IsObjectMovingOffEdgeOfScreen: ; 70ed
.check_y
ld hl, OBJECT_NEXT_MAP_Y
add hl, bc
ld a, [YCoord]
ld a, [wYCoord]
cp [hl]
jr z, .nope
jr nc, .yes
@@ -483,11 +483,11 @@ IsObjectMovingOffEdgeOfScreen: ; 70ed
; 7113
Unreferenced_Function7113:
ld a, [PlayerStandingMapX]
ld a, [wPlayerStandingMapX]
ld d, a
ld a, [PlayerStandingMapY]
ld a, [wPlayerStandingMapY]
ld e, a
ld bc, ObjectStructs
ld bc, wObjectStructs
xor a
.loop
ld [hObjectStructIndexBuffer], a