diff options
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/map_objects.asm | 4 | ||||
| -rwxr-xr-x | engine/overworld/movement.asm | 8 | ||||
| -rwxr-xr-x | engine/overworld/player_object.asm | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 6c344d31..887fb753 100755 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -673,7 +673,7 @@ Function55a1 jr z, .asm_55b8 call Function55bc .asm_55b8 - call UpdateSprites_ + call _UpdateSprites ret Function55bc: ; 55bc (1:55bc) @@ -1154,7 +1154,7 @@ Function5879: ; 5879 (1:5879) .data db 6,7,8,9 -UpdateSprites_:: ; 5896 (1:5896) +_UpdateSprites:: ; 5896 (1:5896) ld a, [wVramState] bit 0, a ret z diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 5a299571..d98b47ee 100755 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -1,6 +1,6 @@ GetMovementByte: - ld hl, wMovementDataPointerBank - call GetMovementByte_ + ld hl, wMovementDataBank + call _GetMovementByte ret Function4fbd: @@ -9,7 +9,7 @@ Function4fbd: ld e, [hl] inc [hl] ld d, $0 - ld hl, wMovementPerson + ld hl, wMovementObject ld a, [hli] ld h, [hl] ld l, a @@ -36,7 +36,7 @@ Function4fdf: ; 4fdf (1:4fdf) jp Function4fe9 GetMovementPerson - ld a, [wMovementPerson] + ld a, [wMovementObject] ret Function4fe9: ; 4fe9 (1:4fe9) diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 06b38e94..0865dbf8 100755 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -4,11 +4,11 @@ BlankScreen: ldh [hBGMapMode], a call ClearBGPalettes call ClearSprites - ld hl, wTileMap + ld hl, wTilemap ld bc, SCREEN_HEIGHT * SCREEN_WIDTH ld a, " " call ByteFill - ld hl, wAttrMap + ld hl, wAttrmap ld bc, SCREEN_HEIGHT * SCREEN_WIDTH ld a, $7 call ByteFill @@ -122,7 +122,7 @@ SpawnPlayer2: .PlayerObjectTemplate: object_event -4, -4, SPRITE_CHRIS, SPRITEMOVEDATA_12, 15, 15, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, 0, -1 -CopyObjectStruct_:: ; 86d7 (2:46d7) +CopyObjectStruct:: ; 86d7 (2:46d7) call CheckObjectMask and a ret nz @@ -242,7 +242,7 @@ InitializeVariableSprites: cp $b jr nc, .asm_87ab push bc - call CopyObjectStruct_ + call CopyObjectStruct pop bc jp c, Function87b9 .asm_87ab @@ -315,7 +315,7 @@ asm_87da jr nc, .asm_8814 push de push bc - call CopyObjectStruct_ + call CopyObjectStruct pop bc pop de .asm_8814 @@ -370,7 +370,7 @@ asm_882e jr nc, .asm_8868 push de push bc - call CopyObjectStruct_ + call CopyObjectStruct pop bc pop de .asm_8868 |