diff options
Diffstat (limited to 'engine/overworld/map_objects.asm')
| -rw-r--r-- | engine/overworld/map_objects.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index cf532fea6..16562213b 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -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 @@ -430,7 +430,7 @@ RestoreDefaultMovement: ret .ok - ld a, SPRITEMOVEFN_STANDING + ld a, SPRITEMOVEDATA_STANDING_DOWN ret ClearObjectMovementByteIndex: @@ -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 @@ -2466,7 +2466,7 @@ RefreshPlayerSprite: jr ContinueSpawnFacing SpawnInFacingDown: - ld a, 0 + ld a, DOWN ContinueSpawnFacing: ld bc, wPlayerStruct call SetSpriteDirection @@ -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 |