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

Rename OBJECT_LENGTH to MAPOBJECT_LENGTH and OBJECT_STRUCT_LENGTH to OBJECT_LENGTH

Browse Source
This commit is contained in:
Rangi
2019-11-03 12:25:59 -05:00
parent 01f68fcc6a
commit 5134266b9a
10 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/overworld/events.asm
View File

@@ -1626,7 +1626,7 @@ CmdQueue_StoneTable:
jr c, .fall_down_hole
.next
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, de
ld d, h
ld e, l

22
engine/overworld/map_objects.asm
View File

@@ -10,7 +10,7 @@ DeleteMapObject::
push af
ld h, b
ld l, c
ld bc, OBJECT_STRUCT_LENGTH
ld bc, OBJECT_LENGTH
xor a
call ByteFill
pop af
@@ -2082,11 +2082,11 @@ DespawnEmote:
jr z, .next
push bc
xor a
ld bc, OBJECT_STRUCT_LENGTH
ld bc, OBJECT_LENGTH
call ByteFill
pop bc
.next
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, de
ld d, h
ld e, l
@@ -2149,7 +2149,7 @@ Function55e0::
jr z, .ok
call Function565c
.ok
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@@ -2205,7 +2205,7 @@ Function5645:
.loop
ldh [hMapObjectIndexBuffer], a
call SetFacing_Standing
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@@ -2421,7 +2421,7 @@ HandleNPCStep::
jr z, .next
call Function437b
.next
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@@ -2582,7 +2582,7 @@ Function587a:
add hl, bc
set OBJ_FLAGS2_5, [hl]
.next
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@@ -2625,7 +2625,7 @@ Function58b9::
add hl, bc
res OBJ_FLAGS2_5, [hl]
.next
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@@ -2750,7 +2750,7 @@ ApplyBGMapAnchorToObjects:
add e
ld [hl], a
.skip
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@@ -2809,7 +2809,7 @@ InitSprites:
jr .add
.skip
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@@ -2817,7 +2817,7 @@ InitSprites:
jr .next
.add
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l

2
engine/overworld/map_objects_2.asm
View File

@@ -19,7 +19,7 @@ LoadObjectMasks:
ld [de], a
inc de
pop bc
ld hl, OBJECT_LENGTH
ld hl, MAPOBJECT_LENGTH
add hl, bc
ld b, h
ld c, l

4
engine/overworld/npc_movement.asm
View File

@@ -369,7 +369,7 @@ IsNPCAtCoord:
jr nz, .setcarry
.next
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@@ -523,7 +523,7 @@ Unreferenced_Function7113:
jr .yes
.next
ld hl, OBJECT_STRUCT_LENGTH
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l

2
engine/overworld/overworld.asm
View File

@@ -109,7 +109,7 @@ AddIndoorSprites:
push af
ld a, [hl]
call AddSpriteGFX
ld de, OBJECT_LENGTH
ld de, MAPOBJECT_LENGTH
add hl, de
pop af
inc a

16
engine/overworld/player_object.asm
View File

@@ -132,9 +132,9 @@ CopyObjectStruct::
and a
ret nz ; masked
ld hl, wObjectStructs + OBJECT_STRUCT_LENGTH * 1
ld hl, wObjectStructs + OBJECT_LENGTH * 1
ld a, 1
ld de, OBJECT_STRUCT_LENGTH
ld de, OBJECT_LENGTH
.loop
ldh [hObjectStructIndexBuffer], a
ld a, [hl]
@@ -224,7 +224,7 @@ CopyMapObjectToObjectStruct:
ret
InitializeVisibleSprites:
ld bc, wMapObjects + OBJECT_LENGTH
ld bc, wMapObjects + MAPOBJECT_LENGTH
ld a, 1
.loop
ldh [hMapObjectIndexBuffer], a
@@ -271,7 +271,7 @@ InitializeVisibleSprites:
jp c, .ret
.next
ld hl, OBJECT_LENGTH
ld hl, MAPOBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@@ -311,7 +311,7 @@ CheckObjectEnteringVisibleRange::
ld d, a
ld a, [wXCoord]
ld e, a
ld bc, wMapObjects + OBJECT_LENGTH
ld bc, wMapObjects + MAPOBJECT_LENGTH
ld a, 1
.loop_v
ldh [hMapObjectIndexBuffer], a
@@ -345,7 +345,7 @@ CheckObjectEnteringVisibleRange::
pop de
.next_v
ld hl, OBJECT_LENGTH
ld hl, MAPOBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@@ -367,7 +367,7 @@ CheckObjectEnteringVisibleRange::
ld e, a
ld a, [wYCoord]
ld d, a
ld bc, wMapObjects + OBJECT_LENGTH
ld bc, wMapObjects + MAPOBJECT_LENGTH
ld a, 1
.loop_h
ldh [hMapObjectIndexBuffer], a
@@ -401,7 +401,7 @@ CheckObjectEnteringVisibleRange::
pop de
.next_h
ld hl, OBJECT_LENGTH
ld hl, MAPOBJECT_LENGTH
add hl, bc
ld b, h
ld c, l