diff options
Diffstat (limited to 'engine/overworld/player_object.asm')
| -rw-r--r-- | engine/overworld/player_object.asm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 08a990f4b..4cdbaa313 100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -1,7 +1,7 @@ BlankScreen: call DisableSpriteUpdates xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a call ClearBGPalettes call ClearSprites hlcoord 0, 0 @@ -41,10 +41,10 @@ SpawnPlayer: .ok ld [hl], e ld a, PLAYER_OBJECT - ld [hMapObjectIndexBuffer], a + ldh [hMapObjectIndexBuffer], a ld bc, wMapObjects ld a, PLAYER_OBJECT - ld [hObjectStructIndexBuffer], a + ldh [hObjectStructIndexBuffer], a ld de, wObjectStructs call CopyMapObjectToObjectStruct ld a, PLAYER @@ -93,7 +93,7 @@ WriteObjectXY:: ld hl, OBJECT_NEXT_MAP_Y add hl, bc ld e, [hl] - ld a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndexBuffer] ld b, a call CopyDECoordsToMapObject and a @@ -136,12 +136,12 @@ CopyObjectStruct:: ld a, 1 ld de, OBJECT_STRUCT_LENGTH .loop - ld [hObjectStructIndexBuffer], a + ldh [hObjectStructIndexBuffer], a ld a, [hl] and a jr z, .done add hl, de - ld a, [hObjectStructIndexBuffer] + ldh a, [hObjectStructIndexBuffer] inc a cp NUM_OBJECT_STRUCTS jr nz, .loop @@ -167,12 +167,12 @@ CopyMapObjectToObjectStruct: ret .CopyMapObjectToTempObject: - ld a, [hObjectStructIndexBuffer] + ldh a, [hObjectStructIndexBuffer] ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld [hl], a - ld a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndexBuffer] ld [wTempObjectCopyMapObjectIndex], a ld hl, MAPOBJECT_SPRITE @@ -227,7 +227,7 @@ InitializeVisibleSprites: ld bc, wMapObjects + OBJECT_LENGTH ld a, 1 .loop - ld [hMapObjectIndexBuffer], a + ldh [hMapObjectIndexBuffer], a ld hl, MAPOBJECT_SPRITE add hl, bc ld a, [hl] @@ -275,7 +275,7 @@ InitializeVisibleSprites: add hl, bc ld b, h ld c, l - ld a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndexBuffer] inc a cp NUM_OBJECTS jr nz, .loop @@ -314,7 +314,7 @@ CheckObjectEnteringVisibleRange:: ld bc, wMapObjects + OBJECT_LENGTH ld a, 1 .loop_v - ld [hMapObjectIndexBuffer], a + ldh [hMapObjectIndexBuffer], a ld hl, MAPOBJECT_SPRITE add hl, bc ld a, [hl] @@ -349,7 +349,7 @@ CheckObjectEnteringVisibleRange:: add hl, bc ld b, h ld c, l - ld a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndexBuffer] inc a cp NUM_OBJECTS jr nz, .loop_v @@ -370,7 +370,7 @@ CheckObjectEnteringVisibleRange:: ld bc, wMapObjects + OBJECT_LENGTH ld a, 1 .loop_h - ld [hMapObjectIndexBuffer], a + ldh [hMapObjectIndexBuffer], a ld hl, MAPOBJECT_SPRITE add hl, bc ld a, [hl] @@ -405,7 +405,7 @@ CheckObjectEnteringVisibleRange:: add hl, bc ld b, h ld c, l - ld a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndexBuffer] inc a cp NUM_OBJECTS jr nz, .loop_h @@ -514,14 +514,14 @@ CopyTempObjectToObjectStruct: ret TrainerWalkToPlayer: - ld a, [hLastTalked] + ldh a, [hLastTalked] call InitMovementBuffer ld a, movement_step_sleep call AppendToMovementBuffer ld a, [wd03f] dec a jr z, .TerminateStep - ld a, [hLastTalked] + ldh a, [hLastTalked] ld b, a ld c, PLAYER ld d, 1 @@ -678,7 +678,7 @@ FollowNotExact:: ld hl, OBJECT_SPRITE_Y add hl, de ld [hl], a - ld a, [hObjectStructIndexBuffer] + ldh a, [hObjectStructIndexBuffer] ld hl, OBJECT_RANGE add hl, de ld [hl], a |