diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-25 12:24:18 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-25 12:24:18 -0400 |
| commit | 1caa50a6474edd3896911409d548faa0731621b7 (patch) | |
| tree | 9a707e1630fcdb7405d9018db3b0fa39b798ecdf /engine/overworld | |
| parent | 5693cc49cfe6db05890c6f5fa8fbe460048f02c2 (diff) | |
No space between labels and bodies
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/events.asm | 1 | ||||
| -rw-r--r-- | engine/overworld/npc_movement.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/player_movement.asm | 5 | ||||
| -rw-r--r-- | engine/overworld/select_menu.asm | 3 |
4 files changed, 0 insertions, 11 deletions
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index daa7b8414..dfde757d9 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -485,7 +485,6 @@ CheckTimeEvents: ret OWPlayerInput: - call PlayerMovement ret c and a diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 868df2254..b21e46700 100644 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -1,5 +1,4 @@ CanObjectMoveInDirection: - ld hl, OBJECT_PALETTE add hl, bc bit SWIMMING_F, [hl] @@ -216,7 +215,6 @@ Function6fa1: ret CheckFacingObject:: - call GetFacingTileCoord ; Double the distance for counter tiles. diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index 0a2674341..c70357f13 100644 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -256,7 +256,6 @@ DoPlayerMovement:: ret .TryStep: - ; Surfing actually calls .TrySurf directly instead of passing through here. ld a, [wPlayerState] cp PLAYER_SURF @@ -321,7 +320,6 @@ DoPlayerMovement:: ret .TrySurf: - call .CheckSurfPerms ld [wd040], a jr c, .surf_bump @@ -395,7 +393,6 @@ DoPlayerMovement:: db FACE_UP | FACE_LEFT ; COLL_HOP_UP_LEFT .CheckWarp: - ; Bug: Since no case is made for STANDING here, it will check ; [.edgewarps + $ff]. This resolves to $3e at $8035a. ; This causes wd041 to be nonzero when standing on tile $3e, @@ -657,7 +654,6 @@ DoPlayerMovement:: ret .CheckStrengthBoulder: - ld hl, wBikeFlags bit BIKEFLAGS_STRENGTH_ACTIVE_F, [hl] jr z, .not_boulder @@ -779,7 +775,6 @@ DoPlayerMovement:: ret .BumpSound: - call CheckSFX ret c ld de, SFX_BUMP diff --git a/engine/overworld/select_menu.asm b/engine/overworld/select_menu.asm index 28667d033..9eba9de83 100644 --- a/engine/overworld/select_menu.asm +++ b/engine/overworld/select_menu.asm @@ -1,5 +1,4 @@ SelectMenu:: - call CheckRegisteredItem jr c, .NotRegistered jp UseRegisteredItem @@ -17,7 +16,6 @@ ItemMayBeRegisteredText: db "@" CheckRegisteredItem: - ld a, [wWhichRegisteredItem] and a jr z, .NoRegisteredItem @@ -110,7 +108,6 @@ CheckRegisteredItem: ret UseRegisteredItem: - farcall CheckItemMenu ld a, [wItemAttributeParamBuffer] ld hl, .SwitchTo |